[SCM] morituri/master: * morituri/common/encode.py: * morituri/rip/image.py: Provide status on the retagging.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c68848026a7594ef1ff6c41c8f91d9ccd69b5d20
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Wed Apr 14 22:01:45 2010 +0000

    	* morituri/common/encode.py:
    	* morituri/rip/image.py:
    	  Provide status on the retagging.

diff --git a/ChangeLog b/ChangeLog
index 9f7bd46..db074e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/encode.py:
+	* morituri/rip/image.py:
+	  Provide status on the retagging.
+
+2010-04-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	patch by: Peter Oliver
 
 	* morituri/program/cdparanoia.py:
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index 15a492e..05d9146 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -492,6 +492,7 @@ class SafeRetagTask(task.MultiSeparateTask):
                         shutil.copymode(self._path, self._tmppath)
                         self.debug('moving temporary file to %r' % self._path)
                         os.rename(self._tmppath, self._path)
+                        self.changed = True
                     else:
                         # FIXME: don't raise TypeError
                         e = TypeError("Checksums failed")
diff --git a/morituri/rip/image.py b/morituri/rip/image.py
index f5eed78..0584c6c 100644
--- a/morituri/rip/image.py
+++ b/morituri/rip/image.py
@@ -125,7 +125,14 @@ class Retag(logcommand.LogCommand):
                 taglist = prog.getTagList(track.number)
                 self.debug('possibly retagging %r with taglist %r',
                     path, taglist)
-                runner.run(encode.SafeRetagTask(path, taglist))
+                t = encode.SafeRetagTask(path, taglist)
+                runner.run(t)
+                path = os.path.basename(path)
+                if t.changed:
+                    print 'Retagged %s' % path
+                else:
+                    print '%s already tagged correctly' % path
+            print
 
 class Verify(logcommand.LogCommand):
     summary = "verify image"

-- 
morituri packaging