← Back to branch summary

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

« back to all changes in this revision

Viewing changes to virtinst/XMLBuilderDomain.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/XMLBuilderDomain.py
349
349
                    # Boolean property, creating the node is enough
350
350
                    pass
351
351
                else:
352
 
                    node.setContent(str(val))
 
352
                    node.setContent(_util.xml_escape(str(val)))
353
353
            else:
354
354
                _remove_xpath_node(self._xml_node, usexpath)
355
355
 
422
422
            raise ValueError(_("'conn' must be a virConnect instance."))
423
423
        self._conn = val
424
424
        self._conn_uri = self._conn.getURI()
425
 
        self.__remote = _util.is_uri_remote(self._conn_uri)
 
425
        self.__remote = _util.is_uri_remote(self._conn_uri, conn=self._conn)
426
426
    conn = property(get_conn, set_conn)
427
427
 
428
428
    def get_uri(self):