diff --git a/4c7c4590-manager-Fix-mem-disk-net-stats-graphs.patch b/4c7c4590-manager-Fix-mem-disk-net-stats-graphs.patch deleted file mode 100644 index 8512675c..00000000 --- a/4c7c4590-manager-Fix-mem-disk-net-stats-graphs.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: manager: Fix mem, disk, net stats graphs (bz 1543896) -From: Cole Robinson crobinso@redhat.com Fri Feb 9 14:02:04 2018 -0500 -Date: Fri Feb 9 14:02:04 2018 -0500: -Git: 4c7c45908f6afd4e0edae9923218472d353caa3a - -python2/3 division compat messed this up - -https://bugzilla.redhat.com/show_bug.cgi?id=1543896 - -diff --git a/virtManager/domain.py b/virtManager/domain.py -index ed94cf1..6d3dac2 100644 ---- a/virtManager/domain.py -+++ b/virtManager/domain.py -@@ -1984,7 +1984,7 @@ class vmmDomain(vmmLibvirtObject): - except libvirt.libvirtError as err: - logging.error("Error reading mem stats: %s", err) - -- pcentCurrMem = (curmem // float(totalmem)) * 100 -+ pcentCurrMem = (curmem / float(totalmem)) * 100 - pcentCurrMem = max(0.0, min(pcentCurrMem, 100.0)) - - return pcentCurrMem, curmem -diff --git a/virtManager/manager.py b/virtManager/manager.py -index d6640fb..d38fc4e 100644 ---- a/virtManager/manager.py -+++ b/virtManager/manager.py -@@ -1068,7 +1068,7 @@ class vmmManager(vmmGObjectUI): - return - - d1, d2 = obj.disk_io_vectors(GRAPH_LEN, self.max_disk_rate) -- data = [(x + y) // 2 for x, y in zip(d1, d2)] -+ data = [(x + y) / 2 for x, y in zip(d1, d2)] - cell.set_property('data_array', data) - - def network_traffic_img(self, column_ignore, cell, model, _iter, data): -@@ -1077,5 +1077,5 @@ class vmmManager(vmmGObjectUI): - return - - d1, d2 = obj.network_traffic_vectors(GRAPH_LEN, self.max_net_rate) -- data = [(x + y) // 2 for x, y in zip(d1, d2)] -+ data = [(x + y) / 2 for x, y in zip(d1, d2)] - cell.set_property('data_array', data) diff --git a/virt-manager-1.5.0.tar.bz2 b/virt-manager-1.5.0.tar.bz2 deleted file mode 100644 index e5c39391..00000000 --- a/virt-manager-1.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33e0de18182cb3335ce2844c09917786d9db66b208f059a97ca37a6381535578 -size 1547509 diff --git a/virt-manager-1.5.1.tar.bz2 b/virt-manager-1.5.1.tar.bz2 new file mode 100644 index 00000000..55697feb --- /dev/null +++ b/virt-manager-1.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df7d2519d54e77b98d5d96b2b012311dae10eaf2c19e2c8019dbbb36f66e7d46 +size 1548321 diff --git a/virt-manager.changes b/virt-manager.changes index 6190ec80..c919da31 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu May 31 11:45:17 MDT 2018 - carnold@suse.com + +- bsc#1081544 - SLEx_15_LOC : YaST: ALL_LANGS:Untranslated text + 'Options' in Virtualization/Create a new Virtual Machine/Network + Install (HTTP...)/Step 2 of 5 dialog +- bsc#1081542 - SLEx_15_LOC : YaST: ALL_LANGS:Untranslated text. + Translation fix included in new tarball. + virtman-fix-missing-translations.patch + +------------------------------------------------------------------- +Mon May 21 11:35:45 MDT 2018 - carnold@suse.com + +- Update to virt-manager 1.5.1 (bsc#1027942). This was a quick bug + bugfix release that came out shortly after version 1.5.0 + virt-manager-1.5.1.tar.bz2 +- Drop 4c7c4590-manager-Fix-mem-disk-net-stats-graphs.patch + ------------------------------------------------------------------- Thu Apr 26 15:00:36 MDT 2018 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 200b5011..6505f616 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -23,11 +23,11 @@ %define libvirt_xen_packages "" %define preferred_distros "sles15,opensuse15" %define kvm_packages "" -%define _version 1.5.0 +%define _version 1.5.1 %define _release 0 Name: virt-manager -Version: 1.5.0 +Version: 1.5.1 Release: 0 Summary: Virtual Machine Manager License: GPL-2.0-or-later @@ -38,7 +38,6 @@ Source1: virt-install.rb Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches -Patch0: 4c7c4590-manager-Fix-mem-disk-net-stats-graphs.patch Patch1: 27d4b167-virtinst-update-location-for-opensuse.patch Patch2: d15b78ab-virtinst-read-CPU-model-from-domain-capabilities.patch Patch3: fd6a8154-virtinst-compare-host-and-domain-cpu-models.patch @@ -74,6 +73,7 @@ Patch152: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch Patch153: virtman-check-for-valid-display.patch Patch154: virtman-allow-creating-i686-vm.patch Patch155: virtman-dont-specify-vte-version.patch +Patch156: virtman-fix-missing-translations.patch Patch160: virtinst-xen-drive-type.patch Patch161: virtinst-xenbus-disk-index-fix.patch Patch162: virtinst-refresh_before_fetch_pool.patch @@ -183,7 +183,6 @@ machine). %prep %setup -q # Upstream Patches -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -219,6 +218,7 @@ machine). %patch153 -p1 %patch154 -p1 %patch155 -p1 +%patch156 -p1 %patch160 -p1 %patch161 -p1 %patch162 -p1 diff --git a/virtinst-nfs-install-sanitize.patch b/virtinst-nfs-install-sanitize.patch index 61e17c8c..8291dbc6 100644 --- a/virtinst-nfs-install-sanitize.patch +++ b/virtinst-nfs-install-sanitize.patch @@ -5,11 +5,11 @@ A fix for accessing nfs mounted media. A comment in the code states, and carry the latter form around internally" We need the RFC version to work correctly whereas redhat's anaconda needs their own modified version. -Index: virt-manager-1.5.0/virtinst/util.py +Index: virt-manager-1.5.1/virtinst/util.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/util.py -+++ virt-manager-1.5.0/virtinst/util.py -@@ -374,3 +374,22 @@ def getInstallRepos(): +--- virt-manager-1.5.1.orig/virtinst/util.py ++++ virt-manager-1.5.1/virtinst/util.py +@@ -369,3 +369,22 @@ def getInstallRepos(): return (0, []) return lookupZypperRepos(getHostInstallSource()) @@ -32,10 +32,10 @@ Index: virt-manager-1.5.0/virtinst/util.py + + return url + -Index: virt-manager-1.5.0/virtinst/distroinstaller.py +Index: virt-manager-1.5.1/virtinst/distroinstaller.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/distroinstaller.py -+++ virt-manager-1.5.0/virtinst/distroinstaller.py +--- virt-manager-1.5.1.orig/virtinst/distroinstaller.py ++++ virt-manager-1.5.1/virtinst/distroinstaller.py @@ -44,6 +44,8 @@ def _sanitize_url(url): """ Do nothing for http or ftp, but make sure nfs is in the expected format @@ -45,10 +45,10 @@ Index: virt-manager-1.5.0/virtinst/distroinstaller.py if url.startswith("nfs://"): # Convert RFC compliant NFS nfs://server/path/to/distro # to what mount/anaconda expect nfs:server:/path/to/distro -Index: virt-manager-1.5.0/virtinst/urlfetcher.py +Index: virt-manager-1.5.1/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.5.0/virtinst/urlfetcher.py +--- virt-manager-1.5.1.orig/virtinst/urlfetcher.py ++++ virt-manager-1.5.1/virtinst/urlfetcher.py @@ -33,6 +33,7 @@ import urlparse import requests diff --git a/virtinst-python2-to-python3-conversion.patch b/virtinst-python2-to-python3-conversion.patch index 47311397..fdf04fdd 100644 --- a/virtinst-python2-to-python3-conversion.patch +++ b/virtinst-python2-to-python3-conversion.patch @@ -1,17 +1,17 @@ -Index: virt-manager-1.5.0/virt-install +Index: virt-manager-1.5.1/virt-install =================================================================== ---- virt-manager-1.5.0.orig/virt-install -+++ virt-manager-1.5.0/virt-install +--- virt-manager-1.5.1.orig/virt-install ++++ virt-manager-1.5.1/virt-install @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python3 # # Copyright 2005-2014 Red Hat, Inc. # -Index: virt-manager-1.5.0/virtinst/uri.py +Index: virt-manager-1.5.1/virtinst/uri.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/uri.py -+++ virt-manager-1.5.0/virtinst/uri.py +--- virt-manager-1.5.1.orig/virtinst/uri.py ++++ virt-manager-1.5.1/virtinst/uri.py @@ -19,7 +19,7 @@ import logging @@ -30,10 +30,10 @@ Index: virt-manager-1.5.0/virtinst/uri.py (self.scheme, self.username, self.hostname, self.path, self.query, self.fragment) = self._split(unquoted_uri) -Index: virt-manager-1.5.0/virtinst/hostkeymap.py +Index: virt-manager-1.5.1/virtinst/hostkeymap.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/hostkeymap.py -+++ virt-manager-1.5.0/virtinst/hostkeymap.py +--- virt-manager-1.5.1.orig/virtinst/hostkeymap.py ++++ virt-manager-1.5.1/virtinst/hostkeymap.py @@ -20,6 +20,7 @@ import logging import os @@ -51,10 +51,10 @@ Index: virt-manager-1.5.0/virtinst/hostkeymap.py for key in sorted_keys: origkey = key -Index: virt-manager-1.5.0/virtinst/support.py +Index: virt-manager-1.5.1/virtinst/support.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/support.py -+++ virt-manager-1.5.0/virtinst/support.py +--- virt-manager-1.5.1.orig/virtinst/support.py ++++ virt-manager-1.5.1/virtinst/support.py @@ -167,7 +167,7 @@ class _SupportCheck(object): self.hv_version = hv_version or {} self.hv_libvirt_version = hv_libvirt_version or {} @@ -64,10 +64,10 @@ Index: virt-manager-1.5.0/virtinst/support.py for vstr in versions: v = _version_str_to_int(vstr) if vstr is not None and v != 0 and v < 7009: -Index: virt-manager-1.5.0/virtinst/osdict.py +Index: virt-manager-1.5.1/virtinst/osdict.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/osdict.py -+++ virt-manager-1.5.0/virtinst/osdict.py +--- virt-manager-1.5.1.orig/virtinst/osdict.py ++++ virt-manager-1.5.1/virtinst/osdict.py @@ -79,7 +79,7 @@ def _sort(tosort, sortpref=None, limit_p retlist = [] sortpref = sortpref or [] @@ -101,10 +101,10 @@ Index: virt-manager-1.5.0/virtinst/osdict.py if typename and typename != osobj.get_typename(): continue if only_supported and not osobj.get_supported(): -Index: virt-manager-1.5.0/virtinst/guest.py +Index: virt-manager-1.5.1/virtinst/guest.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/guest.py -+++ virt-manager-1.5.0/virtinst/guest.py +--- virt-manager-1.5.1.orig/virtinst/guest.py ++++ virt-manager-1.5.1/virtinst/guest.py @@ -434,7 +434,7 @@ class Guest(XMLBuilder): domain.undefine() except Exception: @@ -123,10 +123,10 @@ Index: virt-manager-1.5.0/virtinst/guest.py if len(devs) > 1 and 0 in devs: devs[0].address.multifunction = True -Index: virt-manager-1.5.0/virtinst/distroinstaller.py +Index: virt-manager-1.5.1/virtinst/distroinstaller.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/distroinstaller.py -+++ virt-manager-1.5.0/virtinst/distroinstaller.py +--- virt-manager-1.5.1.orig/virtinst/distroinstaller.py ++++ virt-manager-1.5.1/virtinst/distroinstaller.py @@ -68,7 +68,7 @@ def _sanitize_url(url): MEDIA_LOCATION_URL, MEDIA_CDROM_PATH, @@ -136,10 +136,10 @@ Index: virt-manager-1.5.0/virtinst/distroinstaller.py class DistroInstaller(Installer): -Index: virt-manager-1.5.0/virtinst/cli.py +Index: virt-manager-1.5.1/virtinst/cli.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/cli.py -+++ virt-manager-1.5.0/virtinst/cli.py +--- virt-manager-1.5.1.orig/virtinst/cli.py ++++ virt-manager-1.5.1/virtinst/cli.py @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. @@ -176,10 +176,10 @@ Index: virt-manager-1.5.0/virtinst/cli.py if cliname not in inst.os.BOOT_DEVICES: continue -Index: virt-manager-1.5.0/virtinst/xmlbuilder.py +Index: virt-manager-1.5.1/virtinst/xmlbuilder.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/xmlbuilder.py -+++ virt-manager-1.5.0/virtinst/xmlbuilder.py +--- virt-manager-1.5.1.orig/virtinst/xmlbuilder.py ++++ virt-manager-1.5.1/virtinst/xmlbuilder.py @@ -327,7 +327,7 @@ class XMLChildProperty(property): def _findpropname(self, xmlbuilder): @@ -198,7 +198,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py if val is self: self._propname = key break -@@ -829,7 +829,7 @@ class XMLBuilder(object): +@@ -832,7 +832,7 @@ class XMLBuilder(object): self.conn = conn if self._XML_SANITIZE: @@ -207,7 +207,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py parsexml = "".join([c for c in parsexml if c in string.printable]) self._propstore = {} -@@ -843,7 +843,7 @@ class XMLBuilder(object): +@@ -846,7 +846,7 @@ class XMLBuilder(object): def _initial_child_parse(self): # Walk the XML tree and hand of parsing to any registered # child classes @@ -216,7 +216,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py if xmlprop.is_single: child_class = xmlprop.child_classes[0] prop_path = xmlprop.get_prop_xpath(self, child_class) -@@ -885,7 +885,7 @@ class XMLBuilder(object): +@@ -888,7 +888,7 @@ class XMLBuilder(object): # XMLChildProperty stores a list in propstore, which dict shallow # copy won't fix for us. @@ -225,7 +225,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py if not isinstance(value, list): continue ret._propstore[name] = [obj.copy() for obj in ret._propstore[name]] -@@ -926,8 +926,8 @@ class XMLBuilder(object): +@@ -929,8 +929,8 @@ class XMLBuilder(object): if leave_stub: _top_node = _get_xpath_node(self._xmlstate.xml_ctx, self.get_root_xpath()) @@ -236,7 +236,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py for prop in props: prop.clear(self) finally: -@@ -990,7 +990,7 @@ class XMLBuilder(object): +@@ -993,7 +993,7 @@ class XMLBuilder(object): if not hasattr(self.__class__, cachename): ret = {} for c in reversed(type.mro(self.__class__)[:-1]): @@ -245,7 +245,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py if isinstance(val, checkclass): ret[key] = val setattr(self.__class__, cachename, ret) -@@ -1025,7 +1025,7 @@ class XMLBuilder(object): +@@ -1028,7 +1028,7 @@ class XMLBuilder(object): def _find_child_prop(self, child_class, return_single=False): xmlprops = self._all_child_props() @@ -254,7 +254,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py if xmlprop.is_single and not return_single: continue if child_class in xmlprop.child_classes: -@@ -1084,7 +1084,7 @@ class XMLBuilder(object): +@@ -1087,7 +1087,7 @@ class XMLBuilder(object): Return a list of all XML child objects with the passed class """ ret = [] @@ -263,7 +263,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py ret += [obj for obj in util.listify(prop._get(self)) if obj.__class__ == klass] return ret -@@ -1107,7 +1107,7 @@ class XMLBuilder(object): +@@ -1110,7 +1110,7 @@ class XMLBuilder(object): xpaths point at their particular element """ typecount = {} @@ -272,7 +272,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py for obj in util.listify(getattr(self, propname)): idxstr = "" if not xmlprop.is_single: -@@ -1165,7 +1165,7 @@ class XMLBuilder(object): +@@ -1168,7 +1168,7 @@ class XMLBuilder(object): xmlprops = self._all_xml_props() childprops = self._all_child_props() @@ -281,7 +281,7 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py prop._set_default(self) # Set up preferred XML ordering -@@ -1180,7 +1180,7 @@ class XMLBuilder(object): +@@ -1183,7 +1183,7 @@ class XMLBuilder(object): elif key in childprops: do_order.insert(0, key) @@ -290,10 +290,10 @@ Index: virt-manager-1.5.0/virtinst/xmlbuilder.py if key not in do_order: do_order.append(key) -Index: virt-manager-1.5.0/virtinst/domcapabilities.py +Index: virt-manager-1.5.1/virtinst/domcapabilities.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/domcapabilities.py -+++ virt-manager-1.5.0/virtinst/domcapabilities.py +--- virt-manager-1.5.1.orig/virtinst/domcapabilities.py ++++ virt-manager-1.5.1/virtinst/domcapabilities.py @@ -166,7 +166,7 @@ class DomainCapabilities(XMLBuilder): return _("BIOS") return _("None") @@ -312,10 +312,10 @@ Index: virt-manager-1.5.0/virtinst/domcapabilities.py def supports_uefi_xml(self): """ -Index: virt-manager-1.5.0/virtinst/devicedisk.py +Index: virt-manager-1.5.1/virtinst/devicedisk.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/devicedisk.py -+++ virt-manager-1.5.0/virtinst/devicedisk.py +--- virt-manager-1.5.1.orig/virtinst/devicedisk.py ++++ virt-manager-1.5.1/virtinst/devicedisk.py @@ -87,7 +87,7 @@ def _is_dir_searchable(uid, username, pa logging.debug("Cmd '%s' failed: %s", cmd, err) return False @@ -348,10 +348,10 @@ Index: virt-manager-1.5.0/virtinst/devicedisk.py for i in ran: postfix = self.num_to_target(i + 1) -Index: virt-manager-1.5.0/virtinst/storage.py +Index: virt-manager-1.5.1/virtinst/storage.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/storage.py -+++ virt-manager-1.5.0/virtinst/storage.py +--- virt-manager-1.5.1.orig/virtinst/storage.py ++++ virt-manager-1.5.1/virtinst/storage.py @@ -130,7 +130,7 @@ class StoragePool(_StorageObject): """ Return list of appropriate pool types @@ -361,10 +361,10 @@ Index: virt-manager-1.5.0/virtinst/storage.py @staticmethod def get_pool_type_desc(pool_type): -Index: virt-manager-1.5.0/virtinst/devicegraphics.py +Index: virt-manager-1.5.1/virtinst/devicegraphics.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/devicegraphics.py -+++ virt-manager-1.5.0/virtinst/devicegraphics.py +--- virt-manager-1.5.1.orig/virtinst/devicegraphics.py ++++ virt-manager-1.5.1/virtinst/devicegraphics.py @@ -84,7 +84,7 @@ class VirtualGraphics(VirtualDevice): """ from . import hostkeymap @@ -374,10 +374,10 @@ Index: virt-manager-1.5.0/virtinst/devicegraphics.py sort_list = [] orig_list.sort() -Index: virt-manager-1.5.0/virtinst/util.py +Index: virt-manager-1.5.1/virtinst/util.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/util.py -+++ virt-manager-1.5.0/virtinst/util.py +--- virt-manager-1.5.1.orig/virtinst/util.py ++++ virt-manager-1.5.1/virtinst/util.py @@ -147,7 +147,7 @@ def generate_name(base, collision_cb, su else: return collision_cb(tryname) @@ -387,10 +387,10 @@ Index: virt-manager-1.5.0/virtinst/util.py if not force_num: numrange = [None] + numrange -Index: virt-manager-1.5.0/virtinst/urlfetcher.py +Index: virt-manager-1.5.1/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.5.0/virtinst/urlfetcher.py +--- virt-manager-1.5.1.orig/virtinst/urlfetcher.py ++++ virt-manager-1.5.1/virtinst/urlfetcher.py @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. @@ -542,10 +542,10 @@ Index: virt-manager-1.5.0/virtinst/urlfetcher.py if isinstance(obj, type) and issubclass(obj, Distro) and obj.name: allstores.append(obj) -Index: virt-manager-1.5.0/virtinst/diskbackend.py +Index: virt-manager-1.5.1/virtinst/diskbackend.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/diskbackend.py -+++ virt-manager-1.5.0/virtinst/diskbackend.py +--- virt-manager-1.5.1.orig/virtinst/diskbackend.py ++++ virt-manager-1.5.1/virtinst/diskbackend.py @@ -391,7 +391,7 @@ class CloneStorageCreator(_StorageCreato else: vfs = os.statvfs(os.path.dirname(self._path)) @@ -564,10 +564,10 @@ Index: virt-manager-1.5.0/virtinst/diskbackend.py progresscb.start(filename=self._output_path, size=size_bytes, text=text) -Index: virt-manager-1.5.0/virtinst/progress.py +Index: virt-manager-1.5.1/virtinst/progress.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/progress.py -+++ virt-manager-1.5.0/virtinst/progress.py +--- virt-manager-1.5.1.orig/virtinst/progress.py ++++ virt-manager-1.5.1/virtinst/progress.py @@ -481,7 +481,7 @@ def format_number(number, SI=0, space=' depth = depth + 1 number = number / step @@ -577,10 +577,10 @@ Index: virt-manager-1.5.0/virtinst/progress.py # it's an int or a long, which means it didn't get divided, # which means it's already short enough fmt = '%i%s%s' -Index: virt-manager-1.5.0/virtinst/pollhelpers.py +Index: virt-manager-1.5.1/virtinst/pollhelpers.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/pollhelpers.py -+++ virt-manager-1.5.0/virtinst/pollhelpers.py +--- virt-manager-1.5.1.orig/virtinst/pollhelpers.py ++++ virt-manager-1.5.1/virtinst/pollhelpers.py @@ -50,7 +50,7 @@ def _new_poll_helper(origmap, typename, current[connkey] = origmap[connkey] del(origmap[connkey]) diff --git a/virtman-fix-missing-translations.patch b/virtman-fix-missing-translations.patch new file mode 100644 index 00000000..6e37df95 --- /dev/null +++ b/virtman-fix-missing-translations.patch @@ -0,0 +1,23 @@ +References: bsc#1081544 + +Index: virt-manager-1.5.1/po/de.po +=================================================================== +--- virt-manager-1.5.1.orig/po/de.po ++++ virt-manager-1.5.1/po/de.po +@@ -3922,7 +3922,6 @@ msgid "Storage Pools" + msgstr "Speicher-Pools" + + #: ../virtManager/storagelist.py:342 +-#, fuzzy, python-format + msgid "%s Free / %s In Use" + msgstr "%s frei / %s belegt" + +@@ -6191,7 +6190,7 @@ msgstr "URL:" + + #: ../ui/create.ui.h:28 + msgid "Kerne_l options:" +-msgstr "Kernel Options:" ++msgstr "Kernel-Optionen:" + + #: ../ui/create.ui.h:29 + msgid "URL _Options" diff --git a/virtman-show-suse-install-repos.patch b/virtman-show-suse-install-repos.patch index 50c8e52b..191eeec2 100644 --- a/virtman-show-suse-install-repos.patch +++ b/virtman-show-suse-install-repos.patch @@ -1,10 +1,10 @@ Enhancement that gets installation repos from zypper. These locations are then presented as potential installation sources when creating a VM. -Index: virt-manager-1.4.3/virtManager/create.py +Index: virt-manager-1.5.1/virtManager/create.py =================================================================== ---- virt-manager-1.4.3.orig/virtManager/create.py -+++ virt-manager-1.4.3/virtManager/create.py +--- virt-manager-1.5.1.orig/virtManager/create.py ++++ virt-manager-1.5.1/virtManager/create.py @@ -424,7 +424,13 @@ class vmmCreate(vmmGObjectUI): self.widget("install-url-entry").set_text("") self.widget("install-url-options").set_expanded(False) @@ -20,10 +20,10 @@ Index: virt-manager-1.4.3/virtManager/create.py self._set_distro_labels("-", "-") # Install import -Index: virt-manager-1.4.3/virtinst/util.py +Index: virt-manager-1.5.1/virtinst/util.py =================================================================== ---- virt-manager-1.4.3.orig/virtinst/util.py -+++ virt-manager-1.4.3/virtinst/util.py +--- virt-manager-1.5.1.orig/virtinst/util.py ++++ virt-manager-1.5.1/virtinst/util.py @@ -23,9 +23,12 @@ import os import random import re @@ -37,7 +37,7 @@ Index: virt-manager-1.4.3/virtinst/util.py def listify(l): if l is None: -@@ -317,3 +320,57 @@ def make_meter(quiet): +@@ -312,3 +315,57 @@ def make_meter(quiet): if quiet: return progress.BaseMeter() return progress.TextMeter(fo=sys.stdout)