crobinso pushed to virt-manager (f21). "Fix domcapabilities regression in previous build"

[notifications at fedoraproject.org]

>From 0082305227d1f672f21b846d0002ac7316b56e16 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso at redhat.com>
Date: Mon, 20 Apr 2015 11:33:56 -0400
Subject: Fix domcapabilities regression in previous build


diff --git a/0016-domcapabilities-Actually-import-logging.patch b/0016-domcapabilities-Actually-import-logging.patch
new file mode 100644
index 0000000..9665c84
--- /dev/null
+++ b/0016-domcapabilities-Actually-import-logging.patch
@@ -0,0 +1,21 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Mon, 20 Apr 2015 11:26:54 -0400
+Subject: [PATCH virt-manager] domcapabilities: Actually import logging
+
+---
+ virtinst/domcapabilities.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/virtinst/domcapabilities.py b/virtinst/domcapabilities.py
+index bdec335..6474948 100644
+--- a/virtinst/domcapabilities.py
++++ b/virtinst/domcapabilities.py
+@@ -18,6 +18,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ # MA 02110-1301 USA.
+ 
++import logging
++
+ from .xmlbuilder import XMLBuilder, XMLChildProperty
+ from .xmlbuilder import XMLProperty as _XMLProperty
+ 
diff --git a/0017-pylint-Ignore-new-warnings.patch b/0017-pylint-Ignore-new-warnings.patch
new file mode 100644
index 0000000..016f8ba
--- /dev/null
+++ b/0017-pylint-Ignore-new-warnings.patch
@@ -0,0 +1,61 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Mon, 27 Oct 2014 19:20:20 -0400
+Subject: [PATCH virt-manager] pylint: Ignore new warnings
+
+(cherry picked from commit cbf38cbe9f542dd28c982d44f09670b43ed9cdb0)
+---
+ tests/pylint.cfg     | 8 +-------
+ virtManager/clone.py | 1 +
+ virtinst/cli.py      | 1 +
+ 3 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/tests/pylint.cfg b/tests/pylint.cfg
+index e8e9e71..6ba0bc1 100644
+--- a/tests/pylint.cfg
++++ b/tests/pylint.cfg
+@@ -34,7 +34,7 @@ load-plugins=
+ # multiple time (only on the command line, not in the configuration file where
+ # it should appear only once).
+ 
+-disable=Design,Similarities,invalid-name,missing-docstring,line-too-long,too-many-lines,superfluous-parens,bad-whitespace,locally-disabled,no-self-use,unnecessary-lambda,star-args,fixme,global-statement,bare-except,anomalous-backslash-in-string,broad-except,cyclic-import
++disable=Design,Similarities,invalid-name,missing-docstring,line-too-long,too-many-lines,superfluous-parens,bad-whitespace,locally-disabled,no-self-use,unnecessary-lambda,star-args,fixme,global-statement,bare-except,anomalous-backslash-in-string,broad-except,cyclic-import,bad-continuation,locally-enabled
+ 
+ 
+ [REPORTS]
+@@ -44,12 +44,6 @@ disable=Design,Similarities,invalid-name,missing-docstring,line-too-long,too-man
+ # mypackage.mymodule.MyReporterClass.
+ #output-format=text
+ 
+-# Include message's id in output
+-include-ids=no
+-
+-# Include symbolic ids of messages in output
+-symbols=no
+-
+ # Put messages in a separate file for each module / package specified on the
+ # command line instead of printing them on stdout. Reports (if any) will be
+ # written in a file name "pylint_global.[txt|html]".
+diff --git a/virtManager/clone.py b/virtManager/clone.py
+index 8170186..924010b 100644
+--- a/virtManager/clone.py
++++ b/virtManager/clone.py
+@@ -378,6 +378,7 @@ class vmmCloneVM(vmmGObjectUI):
+                                              devtype)
+ 
+             def storage_add(failinfo=None):
++                # pylint: disable=cell-var-from-loop
+                 storage_row[STORAGE_INFO_DEFINFO] = definfo
+                 storage_row[STORAGE_INFO_DO_DEFAULT] = default
+                 storage_row[STORAGE_INFO_CAN_SHARE] = bool(definfo)
+diff --git a/virtinst/cli.py b/virtinst/cli.py
+index e57ffbb..b170aa4 100644
+--- a/virtinst/cli.py
++++ b/virtinst/cli.py
+@@ -1850,6 +1850,7 @@ class ParserRNG(VirtCLIParser):
+         def set_backend_cb(opts, inst, cliname, val):
+             ignore = opts
+             ignore = inst
++            # pylint: disable=attribute-defined-outside-init
+             if cliname == "backend_mode":
+                 self._cli_backend_mode = val
+             elif cliname == "backend_type":
diff --git a/virt-manager.spec b/virt-manager.spec
index c34f399..e5dc37b 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -28,7 +28,7 @@
 
 Name: virt-manager
 Version: 1.1.0
-Release: 7.git%{gitcommit}%{_extra_release}
+Release: 8.git%{gitcommit}%{_extra_release}
 %define verrel %{version}-%{release}
 
 Summary: Virtual Machine Manager
@@ -69,6 +69,9 @@ Patch0013: 0013-guest-Use-sata-by-default-for-q35-cdrom-non-virtio-b.patch
 Patch0014: 0014-addhardware-Don-t-advertise-IDE-for-Q35-bz-1207834.patch
 # Fix 'new vm' regression in the previous build
 Patch0015: 0015-create-Fix-regression-in-ppc64-enablement-patch.patch
+# Fix domcapabilities regression in previous build
+Patch0016: 0016-domcapabilities-Actually-import-logging.patch
+Patch0017: 0017-pylint-Ignore-new-warnings.patch
 
 
 Requires: virt-manager-common = %{verrel}
@@ -165,6 +168,9 @@ machine).
 %patch0014 -p1
 # Fix 'new vm' regression in the previous build
 %patch0015 -p1
+# Fix domcapabilities regression in previous build
+%patch0016 -p1
+%patch0017 -p1
 
 %build
 %if %{qemu_user}
@@ -270,6 +276,9 @@ fi
 
 
 %changelog
+* Mon Apr 20 2015 Cole Robinson <crobinso at redhat.com> - 1.1.0-8.git310f6527
+- Fix domcapabilities regression in previous build
+
 * Sat Apr 18 2015 Cole Robinson <crobinso at redhat.com> - 1.1.0-7.git310f6527
 - Fix 'new vm' regression in the previous build
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/virt-manager.git/commit/?h=f21&id=0082305227d1f672f21b846d0002ac7316b56e16