← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtinst/precise-updates

« back to all changes in this revision

Viewing changes to .pc/0001-fix-path-to-hvmloader.patch/virtinst/Installer.py

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-11 11:47:53 UTC
  • mfrom: (1.6.6 sid)
  • Revision ID: package-import@ubuntu.com-20120211114753-sq9f3xayrma8px2h
Tags: 0.600.1-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/9005_ubuntu_precise.patch: Add Ubuntu precise as a
    supported distro.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0001-fix-path-to-hvmloader.patch/virtinst/Installer.py
179
179
 
180
180
        if not self._scratchdir:
181
181
            self._scratchdir = self._get_scratchdir()
182
 
            logging.debug("scratchdir=%s" % self._scratchdir)
 
182
            logging.debug("scratchdir=%s", self._scratchdir)
183
183
        return self._scratchdir
184
184
    scratchdir = property(get_scratchdir)
185
185
 
408
408
            os.unlink(f)
409
409
 
410
410
        for vol in self._tmpvols:
411
 
            logging.debug("Removing volume '%s'" % vol.name())
 
411
            logging.debug("Removing volume '%s'", vol.name())
412
412
            vol.delete(0)
413
413
 
414
414
        self._tmpvols = []
455
455
        try:
456
456
            fd = os.open(disk.path, os.O_RDONLY)
457
457
        except OSError, (err, msg):
458
 
            logging.debug("Failed to open guest disk: %s" % msg)
 
458
            logging.debug("Failed to open guest disk: %s", msg)
459
459
            if err == errno.EACCES and os.geteuid() != 0:
460
460
                return True # non root might not have access to block devices
461
461
            else: