Fix bitrot

diff --git a/debian/changelog b/debian/changelog
index 1dd7308..9a7a494 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-images (0.0.7) unstable; urgency=low
+
+  * Fix bitrot.
+
+ -- Quentin Smith <quentin@mit.edu>  Mon, 28 May 2018 04:58:29 -0400
+
 invirt-images (0.0.6) precise; urgency=low
 
   * Fixing images for new lv setup to deactivate volumes before modifying.

diff --git a/invirt-images b/invirt-images
index e6f987d..ec79d52 100755 (executable)
--- a/invirt-images
+++ b/invirt-images
@@ -47,8 +47,11 @@ def lvrename(dest, src):
     ret = lvr.wait()
 
     if ret:
+       stderr = lvr.stderr.read()
+       if 'not found' in stderr:
+           return 0
        if verbosity > 0:
-           print lvr.stderr.read()
+           print stderr
        return ret
 
     lvr = subprocess.Popen(['lvrename', "xenvg/%s" % (src,), "xenvg/%s" % (dest,)],
@@ -277,9 +280,9 @@ def main():
             database.session.commit()
     elif options.action == 'update':
         if len(args) > 0:
-            images = [database.CDROM.query().get(arg) for arg in args]
+            images = [database.CDROM.query.get(arg) for arg in args]
         else:
-            images = database.CDROM.query().all()
+            images = database.CDROM.query.all()
         for cdrom in images:
             if cdrom is not None:
                 load_image(cdrom)