nicer output

1 files changed, 12 insertions, 5 deletions

diff --git a/mgagnome b/mgagnome
index 63b29bf..50292d2 100755
--- a/mgagnome
+++ b/mgagnome
@@ -120,11 +120,18 @@ class SpecFile(object):
     @property
     def version(self):
         return subprocess.check_output(["rpm", "--specfile", self.path, "--queryformat", "%{VERSION}\n"]).splitlines()[0]
+
     def update(self, version):
         """Update specfile (increase version)"""
         cur_version = self.version
 
-        if version_cmp(version, cur_version) != 1:
+        compare = version_cmp(version, cur_version)
+
+        if compare == 0:
+            print >>sys.stderr, "ERROR: Already at version %s!" % (cur_version)
+            return False
+
+        if compare != 1:
             print >>sys.stderr, "ERROR: Version %s is older than current version %s!" % (version, cur_version)
             return False
 
@@ -132,17 +139,17 @@ class SpecFile(object):
             data = f.read()
 
             if data.count("%mkrel") != 1:
-                print "WARNING: Multiple %mkrel found; don't know what to do!"
+                print >>sys.stderr, "ERROR: Multiple %mkrel found; don't know what to do!"
                 return False
 
             data, nr = self.re_update_version.subn(r'\g<pre>%s\g<post>' % version, data, 1)
             if nr != 1:
-                print "WARNING: Could not increase version!"
+                print >>sys.stderr, "ERROR: Could not increase version!"
                 return False
 
             data, nr = self.re_update_release.subn(r'\g<pre>%mkrel 1\g<post>', data, 1)
             if nr != 1:
-                print "WARNING: Could not reset release!"
+                print >>sys.stderr, "ERROR: Could not reset release!"
                 return False
 
             # Overwrite file with new version number
@@ -415,7 +422,7 @@ def cmd_package_new_version(options, parser):
 
     subprocess.call(['mgarepo', 'co', package], cwd=cwd)
     s = SpecFile(os.path.join(cwd, package, "SPECS", "%s.spec" % package))
-    print s.version
+    print "%s => %s" % (s.version, options.version)
     if not s.update(options.version):
         sys.exit(1)