[PATCH 2/3] Fix some pylint warnings in the new DNF code.

Chris Lumens clumens at redhat.com
Wed Aug 21 17:34:13 UTC 2013


There are still a variety more, but they appear to be in git but not yet
in a dnf package.  I don't know what to do about this sort of problem in
our jenkins slaves.
---
 pyanaconda/packaging/__init__.py   |  2 +-
 pyanaconda/packaging/dnfpayload.py | 17 ++++++++---------
 pyanaconda/packaging/yumpayload.py |  4 ----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index f6063f4..a90663d 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -667,7 +667,7 @@ class PackagePayload(Payload):
 
         return kernels
 
-    def reset(self):
+    def reset(self, root=None):
         # cdrom: install_device.teardown (INSTALL_TREE)
         # hd: umount INSTALL_TREE, install_device.teardown (ISO_DIR)
         # nfs: umount INSTALL_TREE
diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py
index d58bf96..ba7fd27 100644
--- a/pyanaconda/packaging/dnfpayload.py
+++ b/pyanaconda/packaging/dnfpayload.py
@@ -27,7 +27,6 @@ from pyanaconda.progress import progressQ
 
 import logging
 import multiprocessing
-import operator
 import pyanaconda.constants as constants
 import pyanaconda.errors as errors
 import pyanaconda.packaging as packaging
@@ -154,7 +153,7 @@ class DNFPayload(packaging.PackagePayload):
         if self.data.packages.handleMissing == constants.KS_MISSING_IGNORE:
             return
 
-        if errors.errorHandler.cb(exn, str(exn)) == constants.ERROR_RAISE:
+        if errors.errorHandler.cb(exn, str(exn)) == errors.ERROR_RAISE:
             # The progress bar polls kind of slowly, thus installation could
             # still continue for a bit before the quit message is processed.
             # Doing a sys.exit also ensures the running thread quits before
@@ -195,7 +194,7 @@ class DNFPayload(packaging.PackagePayload):
     @property
     def environments(self):
         environments = self._base.comps.environments_iter
-        return [e.id for e in environments]
+        return [env.id for env in environments]
 
     @property
     def groups(self):
@@ -246,7 +245,7 @@ class DNFPayload(packaging.PackagePayload):
         except dnf.exceptions.DepsolveError as e:
             msg = str(e)
             log.warning(msg)
-            raise errors.DependencyError([msg])
+            raise packaging.DependencyError([msg])
 
         log.info("%d packages selected totalling %s",
                  len(self._base.transaction), self.spaceRequired)
@@ -296,8 +295,8 @@ class DNFPayload(packaging.PackagePayload):
             self._setupMedia(self.install_device)
         try:
             self.checkSoftwareSelection()
-        except errors.DependencyError:
-            if errors.errorHandler.cb(e) == constants.ERROR_RAISE:
+        except packaging.DependencyError:
+            if errors.errorHandler.cb(e) == errors.ERROR_RAISE:
                 progressQ.send_quit(1)
                 sys.exit(1)
 
@@ -327,8 +326,8 @@ class DNFPayload(packaging.PackagePayload):
     def isRepoEnabled(self, repo_id):
         try:
             return self._base.repos[repo_id].enabled
-        except Exception:
-            return super(YumPayload, self).isRepoEnabled(repo_id)
+        except dnf.exceptions.RepoError:
+            return super(DNFPayload, self).isRepoEnabled(repo_id)
 
     def preInstall(self, packages=None, groups=None):
         super(DNFPayload, self).preInstall()
@@ -338,7 +337,7 @@ class DNFPayload(packaging.PackagePayload):
     def release(self):
         pass
 
-    def reset(self):
+    def reset(self, root=None):
         super(DNFPayload, self).reset()
         self.txID = None
 
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index e56f8cc..9385bbd 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -73,10 +73,6 @@ from blivet.size import Size
 import blivet.util
 import blivet.arch
 
-from pyanaconda.image import opticalInstallMedia
-from pyanaconda.image import mountImage
-from pyanaconda.image import findFirstIsoImage
-
 from pyanaconda.errors import ERROR_RAISE, errorHandler
 from pyanaconda.packaging import DependencyError, MetadataError, NoNetworkError, NoSuchGroup, \
                                  NoSuchPackage, PackagePayload, PayloadError, PayloadInstallError, \
-- 
1.8.1.2



More information about the anaconda-patches mailing list