* morituri/common/common.py:

Set the object when we don't persist.
	* examples/readdisc.py:
	  Small fixes.

ChangeLog

@@ -1,3 +1,10 @@
+2009-05-07  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/common.py:
+	  Set the object when we don't persist.
+	* examples/readdisc.py:
+	  Small fixes.
+
 2009-05-06  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* examples/readdisc.py:

examples/readdisc.py

@@ -93,7 +93,7 @@ def musicbrainz(discid):
     # No disc matching this DiscID has been found.
     if len(results) == 0:
         print "Disc is not yet in the MusicBrainz database."
-        print "Consider adding it via", mbdisc.getSubmissionUrl(disc)
+        print "Consider adding it."
         return
 
 
@@ -201,7 +201,7 @@ def main(argv):
                 metadata.tracks[i].title)
         # FIXME: optionally allow overriding reripping
         if not os.path.exists(path):
-            print 'Ripping track %d' % (i + 1)
+            print 'Ripping track %d: %s' % (i + 1, os.path.basename(path))
             t = cdparanoia.ReadVerifyTrackTask(path, ittoc, ittoc.getTrackStart(i + 1),
                 ittoc.getTrackEnd(i + 1),
                 offset=int(options.offset))

morituri/common/common.py

@@ -97,6 +97,10 @@ class Persister(object):
         if object and object == self.object:
             return
 
+        # store the object on ourselves if not None
+        if object is not None:
+            self.object = object
+
         # don't pickle if there is no path
         if not self._path:
             return