Merge lp:~woggle/vmbuilder/misc-fixes into lp:vmbuilder

[Charles Reiss]

Fix bug 1019009 (seems to be caused by Disk.unmap() called with ignore_fail not actually ignore failures), and fix a typo in a debug message.

Unmerged revisions

491. By Charles Reiss on 2014-08-15

Name correct plugin in debug message

490. By Charles Reiss on 2014-08-15

When ignore_fail is true in Disk.unmap, do not fail for already unmapped partitions where part.filename = None

=== modified file 'VMBuilder/disk.py'
--- VMBuilder/disk.py	2012-01-25 13:48:24 +0000
+++ VMBuilder/disk.py	2014-08-15 06:50:19 +0000
@@ -190,6 +190,8 @@
         run_cmd('kpartx', '-d', self.filename, ignore_fail=ignore_fail)
 
         for part in self.partitions:
+            if ignore_fail and not part.filename:
+                continue
             logging.debug("Removing partition %s" % part.filename)
             parted_oldmap=part.filename[len("/dev/mapper/"):-1]+"p"+part.filename[-1]
             dmsetup_output = run_cmd('dmsetup', 'info', parted_oldmap, ignore_fail=True)

=== modified file 'VMBuilder/util.py'
--- VMBuilder/util.py	2013-03-06 21:18:31 +0000
+++ VMBuilder/util.py	2014-08-15 06:50:19 +0000
@@ -170,7 +170,7 @@
         getattr(context, func)(*args, **kwargs)
     except AttributeError as e:
         logging.debug('No such method ({}) in context plugin ({})'.format(
-            func, plugin.__module__))
+            func, context.__module__))
 
 def tmp_filename(suffix='', tmp_root=None):
     # There is a risk in using tempfile.mktemp(): it's not recommended