[Checkins] SVN: z3c.checkversions/trunk/ print old version comment on a separate line to make generated output usable in

[Gediminas Paulauskas]

Log message for revision 122594:
  print old version comment on a separate line to make generated output usable in
  buildout. Until now you would get
  Error: Bad version 3.6.4 # was: 3.6.3
  
  

Changed:
  U   z3c.checkversions/trunk/CHANGELOG.txt
  U   z3c.checkversions/trunk/z3c/checkversions/base.py
  U   z3c.checkversions/trunk/z3c/checkversions/buildout.txt

-=-
Modified: z3c.checkversions/trunk/CHANGELOG.txt
===================================================================
--- z3c.checkversions/trunk/CHANGELOG.txt	2011-08-15 10:54:18 UTC (rev 122593)
+++ z3c.checkversions/trunk/CHANGELOG.txt	2011-08-15 11:09:43 UTC (rev 122594)
@@ -4,7 +4,8 @@
 0.5 (unreleased)
 ----------------
 
-- ...
+- print old version comment on a separate line to make generated output usable in
+  buildout.
 
 0.4.1 (2010-08-25)
 ------------------

Modified: z3c.checkversions/trunk/z3c/checkversions/base.py
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/base.py	2011-08-15 10:54:18 UTC (rev 122593)
+++ z3c.checkversions/trunk/z3c/checkversions/base.py	2011-08-15 11:09:43 UTC (rev 122594)
@@ -118,10 +118,8 @@
                 if self.incremental == True:
                     self.incremental = 'stop'
                 if self.verbose:
-                    print("%s=%s # was: %s"
-                          % (name, new_dist.version, version.split()[0]))
-                else:
-                    print("%s=%s" % (name, new_dist.version))
+                    print("# was: %s" % version.split()[0])
+                print("%s=%s" % (name, new_dist.version))
             elif self.verbose:
                 print("%s=%s" % (name, version.split()[0]))
 

Modified: z3c.checkversions/trunk/z3c/checkversions/buildout.txt
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/buildout.txt	2011-08-15 10:54:18 UTC (rev 122593)
+++ z3c.checkversions/trunk/z3c/checkversions/buildout.txt	2011-08-15 11:09:43 UTC (rev 122594)
@@ -64,9 +64,11 @@
 >>> checker.check(level=2)
 # Checking buildout file ...
 Reading file:///.../zope.interface/
-zope.interface=3.4.1 # was: 3.4.0
+# was: 3.4.0
+zope.interface=3.4.1
 Reading file:///.../zope.component/
-zope.component=3.0.3 # was: 3.0.0
+# was: 3.0.0
+zope.component=3.0.3
 
 The old comments are removed:
 
@@ -78,7 +80,8 @@
 ... index = %s
 ... versions = versions
 ... [versions]
-... zope.interface = 3.4.1 # was: 3.4.0
+... # was: 3.4.0
+... zope.interface = 3.4.1
 ... zope.component = 3.0.3
 ... """ % testindex)
 >>> buildout_file.close()
@@ -87,9 +90,11 @@
 >>> checker.check()
 # Checking buildout file ...
 Reading file:///.../zope.interface/
-zope.interface=3.6.1 # was: 3.4.1
+# was: 3.4.1
+zope.interface=3.6.1
 Reading file:///.../zope.component/
-zope.component=3.9.4 # was: 3.0.3
+# was: 3.0.3
+zope.component=3.9.4
 
 We can provide a blacklist file, containing versions to not suggest.
 This file may come from a buildbot remembering failures.
@@ -107,9 +112,11 @@
 >>> checker.check()
 # Checking buildout file ...
 Reading file:///.../zope.interface/
-zope.interface=3.6.1 # was: 3.4.1
+# was: 3.4.1
+zope.interface=3.6.1
 Reading file:///.../zope.component/
-zope.component=3.9.2 # was: 3.0.3
+# was: 3.0.3
+zope.component=3.9.2
 
 We can let the checker to suggest only one new package. This should be used to
 test a just single new package against a set of other packages.
@@ -121,7 +128,8 @@
 >>> checker.check()
 # Checking buildout file ...
 Reading file:///.../zope.interface/
-zope.interface=3.6.1 # was: 3.4.1
+# was: 3.4.1
+zope.interface=3.6.1
 zope.component=3.0.3
 
 >>> os.remove(blacklist_path)