diff options
Diffstat (limited to 'deskutils/virt-manager/files')
3 files changed, 8 insertions, 50 deletions
diff --git a/deskutils/virt-manager/files/patch-setup.py b/deskutils/virt-manager/files/patch-setup.py index 8da02ca53d03..f267d7c62e9a 100644 --- a/deskutils/virt-manager/files/patch-setup.py +++ b/deskutils/virt-manager/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2014-09-06 22:26:12 UTC +--- setup.py.orig 2015-08-10 18:15:04 UTC +++ setup.py -@@ -209,14 +209,6 @@ class my_build(build): +@@ -208,12 +208,6 @@ class my_build(build): build.run(self) @@ -10,17 +10,17 @@ - """ - def run(self): - pass -- -- + + class my_install(install): - """ - Error if we weren't 'configure'd with the correct install prefix -@@ -601,11 +593,9 @@ setup( +@@ -589,13 +583,11 @@ setup( "virt-convert", "virt-xml", ]), - ("share/glib-2.0/schemas", - ["data/org.virt-manager.virt-manager.gschema.xml"]), + ("share/GConf/gsettings", + ["data/org.virt-manager.virt-manager.convert"]), ("share/virt-manager/ui", glob.glob("ui/*.ui")), - ("share/man/man1", [ @@ -28,7 +28,7 @@ "man/virt-manager.1", "man/virt-install.1", "man/virt-clone.1", -@@ -627,7 +617,6 @@ setup( +@@ -617,7 +609,6 @@ setup( 'sdist': my_sdist, 'install': my_install, diff --git a/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py b/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py deleted file mode 100644 index abe5188a6262..000000000000 --- a/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py +++ /dev/null @@ -1,32 +0,0 @@ -From 0aeee5c449d608d75f5632e9aa47f5e433eb3879 Mon Sep 17 00:00:00 2001 -From: Cole Robinson <crobinso@redhat.com> -Date: Sun, 26 Apr 2015 11:50:01 -0400 -Subject: serialcon: Fix opening with xen (bz 1215357) - -Apparently xen doesn't set <serial> device alias names, and OpenConsole -just opens the first <console> device unconditionally. - -Properly handling that would be to report it in the UI that we can -only open the first console, but for now just drop the alias check. -Apparently SUSE already does this as mentioned in the RH bug - -https://bugzilla.redhat.com/show_bug.cgi?id=1215357 - -diff --git a/virtManager/serialcon.py b/virtManager/serialcon.py -index 92c2029..320811b 100644 ---- ./virtManager/serialcon.py -+++ ./virtManager/serialcon.py -@@ -205,8 +205,9 @@ class LibvirtConsoleConnection(ConsoleConnection): - name = dev and dev.alias.name or None - logging.debug("Opening console stream for dev=%s alias=%s", - dev, name) -- if not name: -- raise RuntimeError(_("Cannot open a device with no alias name")) -+ # libxl doesn't set aliases, their open_console just defaults to -+ # opening the first console device, so don't force prescence of -+ # an alias - - stream = self.conn.get_backend().newStream(libvirt.VIR_STREAM_NONBLOCK) - self.vm.open_console(name, stream) --- -cgit v0.10.2 diff --git a/deskutils/virt-manager/files/patch-virtManager_serialcon.py b/deskutils/virt-manager/files/patch-virtManager_serialcon.py deleted file mode 100644 index db36953908ca..000000000000 --- a/deskutils/virt-manager/files/patch-virtManager_serialcon.py +++ /dev/null @@ -1,10 +0,0 @@ ---- virtManager/serialcon.py.orig 2014-07-28 15:11:32 UTC -+++ virtManager/serialcon.py -@@ -326,7 +326,6 @@ class vmmSerialConsole(vmmGObject): - self.terminal = Vte.Terminal() - self.terminal.set_scrollback_lines(1000) - self.terminal.set_audible_bell(False) -- self.terminal.set_visible_bell(True) - - self.terminal.connect("button-press-event", self.show_serial_rcpopup) - self.terminal.connect("commit", self.console.send_data, self.terminal) |