← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-updates

« back to all changes in this revision

Viewing changes to virtinst/VirtualDisk.py

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-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/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - 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
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtinst/VirtualDisk.py
209
209
            pool = trypool
210
210
 
211
211
    if not vol and not pool:
212
 
        if not _util.is_uri_remote(conn.getURI()):
 
212
        if not _util.is_uri_remote(conn.getURI(), conn=conn):
213
213
            # Building local disk
214
214
            return None, None, False
215
215
 
355
355
        """
356
356
        Check if path exists. If we can't determine, return False
357
357
        """
358
 
        is_remote = _util.is_uri_remote(conn.getURI())
 
358
        is_remote = _util.is_uri_remote(conn.getURI(), conn=conn)
359
359
        try:
360
360
            vol = None
361
361
            path_is_pool = False
383
383
        @return: List of the directories the user cannot search, or empty list
384
384
        @rtype : C{list}
385
385
        """
386
 
        if _util.is_uri_remote(conn.getURI()):
 
386
        if _util.is_uri_remote(conn.getURI(), conn=conn):
387
387
            return []
388
388
 
389
389
        try: