[Plone-cvs] r37953 - in plone.app.blob/trunk: docs src/plone/app/blob src/plone/app/blob/browser

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Sat Jul 17 20:06:19 2010
New Revision: 37953

Modified:
   plone.app.blob/trunk/docs/HISTORY.txt
   plone.app.blob/trunk/src/plone/app/blob/browser/migration.py
   plone.app.blob/trunk/src/plone/app/blob/version.txt
Log:
Correct blob migration count to ignore unrelated messages. This closes #10114.


Modified: plone.app.blob/trunk/docs/HISTORY.txt
==============================================================================
--- plone.app.blob/trunk/docs/HISTORY.txt	(original)
+++ plone.app.blob/trunk/docs/HISTORY.txt	Sat Jul 17 20:06:19 2010
@@ -1,8 +1,12 @@
 Changelog
 =========
 
-1.0b19 - unreleased
--------------------
+1.0 - unreleased
+----------------
+
+- Correct blob migration count to ignore unrelated messages. This closes
+  http://dev.plone.org/plone/ticket/10114.
+  [hannosch]
 
 - Update license to GPL version 2 only.
   [hannosch]

Modified: plone.app.blob/trunk/src/plone/app/blob/browser/migration.py
==============================================================================
--- plone.app.blob/trunk/src/plone/app/blob/browser/migration.py	(original)
+++ plone.app.blob/trunk/src/plone/app/blob/browser/migration.py	Sat Jul 17 20:06:19 2010
@@ -39,7 +39,9 @@
             options = dict(nomigrations=42)
         elif clicked('migrate'):
             output = self.migration()
-            count = len(output.split('\n')) - 1
+            # Only count actual migration lines
+            lines = output.split('\n')
+            count = len([l for l in lines if l.startswith('Migrating')])
             msg = _(u'blob_migration_info',
                 default=u'Blob migration performed for ${count} item(s).',
                 mapping={'count': count})

Modified: plone.app.blob/trunk/src/plone/app/blob/version.txt
==============================================================================
--- plone.app.blob/trunk/src/plone/app/blob/version.txt	(original)
+++ plone.app.blob/trunk/src/plone/app/blob/version.txt	Sat Jul 17 20:06:19 2010
@@ -1 +1 @@
-1.0b19
\ No newline at end of file
+1.0
\ No newline at end of file