[PATCH 3/3] And then fix an assortment of non-packaging pylint errors, too.

Chris Lumens clumens at redhat.com
Thu Aug 30 19:37:26 UTC 2012


---
 pyanaconda/errors.py                | 2 +-
 pyanaconda/rescue.py                | 6 +++---
 pyanaconda/storage/size.py          | 1 +
 pyanaconda/ui/gui/__init__.py       | 2 ++
 pyanaconda/ui/gui/spokes/storage.py | 3 +++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/errors.py b/pyanaconda/errors.py
index 37ee4d0..ae1c577 100644
--- a/pyanaconda/errors.py
+++ b/pyanaconda/errors.py
@@ -133,7 +133,7 @@ class ErrorHandler(object):
         devs = kwargs.pop("devices")
         message = _("The following file systems for your Linux system were "
                     "not unmounted cleanly.  Would you like to mount them "
-                    "anyway?\n%s") % "\n".join(devices)
+                    "anyway?\n%s") % "\n".join(devs)
         if self.ui.showYesNoQuestion(message):
             return ERROR_CONTINUE
         else:
diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py
index be84c1a..8423201 100644
--- a/pyanaconda/rescue.py
+++ b/pyanaconda/rescue.py
@@ -299,9 +299,9 @@ def doRescue(rescue_mount, ksdata, platform):
     if root:
         try:
             # TODO: add a callback to warn about dirty filesystems
-            rc = mountExistingSystem(sto.fsset, root.device,
-                                     allowDirty = True,
-                                     readOnly = readOnly)
+            mountExistingSystem(sto.fsset, root.device,
+                                allowDirty = True,
+                                readOnly = readOnly)
 
             if not flags.imageInstall:
                 msg = _("The system will reboot automatically when you exit "
diff --git a/pyanaconda/storage/size.py b/pyanaconda/storage/size.py
index 75ea933..5b531f1 100644
--- a/pyanaconda/storage/size.py
+++ b/pyanaconda/storage/size.py
@@ -28,6 +28,7 @@ from errors import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
+P_ = lambda x, y, z: gettext.ldngettext("anaconda", x, y, z)
 
 # Decimal prefixes for different size increments, along with the name
 # and accepted abbreviation for the prefix.  These prefixes are all
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index 3f957a4..787f40c 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -171,6 +171,8 @@ class GraphicalUserInterface(UserInterface):
             sys.exit(0)
             return
 
+        ndx = 0
+
         # If the current action wants us to jump to an arbitrary point ahead,
         # look for where that is now.
         if self._actions[0].skipTo:
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 4916a3b..92a8b80 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -143,6 +143,9 @@ class InstallOptions1Dialog(GUIObject):
         options_label.set_markup(options_text)
 
     def _set_free_space_labels(self, disk_free, fs_free):
+        self.disk_free_label = self.builder.get_object("options1_disk_free_label")
+        self.fs_free_label = self.builder.get_object("options1_fs_free_label")
+
         disk_free_text = size_str(disk_free)
         self.disk_free_label.set_text(disk_free_text)
 
-- 
1.7.11.2



More information about the anaconda-patches mailing list