Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/virt-manager-16-pv-serial-console.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17086 2ff0733e53d0
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17086
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     1
 
diff -urN virt-manager-0.6.1/src/virtManager/domain.py ../SUNWvirt-manager-0.6.1.hacked/virt-manager-0.6.1/src/virtManager/domain.py
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     2
 
--- virt-manager-0.6.1/src/virtManager/domain.py	2009-01-26 19:33:33.000000000 +0000
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     3
 
+++ ../SUNWvirt-manager-0.6.1.hacked/virt-manager-0.6.1/src/virtManager/domain.py	2009-12-02 11:58:16.226281287 +0000
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     4
 
@@ -566,6 +566,9 @@
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     5
 
             # [ Name, device type, source path
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     6
 
             serial_list = []
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     7
 
             devs = ctx.xpathEval("/domain/devices/serial")
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     8
 
+            if (len(devs) == 0):
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     9
 
+                devs = ctx.xpathEval("/domain/devices/console")
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    10
 
+
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    11
 
             for node in devs:
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    12
 
                 name = "Serial "
2ff0733e53d0 2009-12-02 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    13
 
                 dev_type = node.prop("type")
upstream/oracle/spec-files