On Thu, 2011-02-10 at 16:04 +0100, Ales Kozumplik wrote:
> This propagates down to reinitializeDialog() and removes the parameter
> there too. The variable is used by DeviceTree but it only repeats what is
> already in the path parameter.
Ack to all three.
Dave
> ---
> pyanaconda/gui.py | 8 ++++----
> pyanaconda/installinterfacebase.py | 4 ++--
> pyanaconda/rescue.py | 2 +-
> pyanaconda/storage/devicetree.py | 6 +-----
> 4 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
> index e04113c..6cbc9dc 100755
> --- a/pyanaconda/gui.py
> +++ b/pyanaconda/gui.py
> @@ -754,7 +754,7 @@ class MessageWindow:
>
> class ReinitializeWindow(MessageWindow):
>
> - def __init__ (self, title, path, size, description, details,
> + def __init__ (self, title, path, size, description,
> default=None, run=True, parent=None, destroyAfterRun=True):
>
> self.debugRid = None
> @@ -1087,14 +1087,14 @@ class InstallInterface(InstallInterfaceBase):
> custom_buttons, custom_icon, run=True, parent=parent).getrc()
> return rc
>
> - def reinitializeWindow(self, title, path, size, description, details):
> + def reinitializeWindow(self, title, path, size, description):
> if self.icw:
> parent = self.icw.window
> else:
> parent = None
>
> - rc = ReinitializeWindow(title, path, size, description, details,
> - parent=parent).getrc()
> + rc = ReinitializeWindow(title, path, size, description, parent=parent).\
> + getrc()
> return rc
>
> def createRepoWindow(self):
> diff --git a/pyanaconda/installinterfacebase.py b/pyanaconda/installinterfacebase.py
> index e349268..59b5d81 100644
> --- a/pyanaconda/installinterfacebase.py
> +++ b/pyanaconda/installinterfacebase.py
> @@ -61,7 +61,7 @@ class InstallInterfaceBase(object):
> def resetInitializeDiskQuestion(self):
> self._initLabelAnswers = {}
>
> - def questionInitializeDisk(self, path, description, size, details=""):
> + def questionInitializeDisk(self, path, description, size):
>
> retVal = False # The less destructive default
>
> @@ -80,7 +80,7 @@ class InstallInterfaceBase(object):
> return self._initLabelAnswers["all"]
>
> rc = self.reinitializeWindow(_("Storage Device Warning"),
> - path, size, description, details)
> + path, size, description)
>
> if rc == 0:
> retVal = False
> diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py
> index e8a25a2..24305a5 100644
> --- a/pyanaconda/rescue.py
> +++ b/pyanaconda/rescue.py
> @@ -111,7 +111,7 @@ class RescueInterface(InstallInterfaceBase):
> def resetReinitInconsistentLVMQuestion(self):
> self._inconsistentLVMAnswers = {}
>
> - def questionInitializeDisk(self, path, description, size, details=""):
> + def questionInitializeDisk(self, path, description, size):
> # Never initialize disks in rescue mode!
> return False
>
> diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
> index 25b1dfe..c74a23c 100644
> --- a/pyanaconda/storage/devicetree.py
> +++ b/pyanaconda/storage/devicetree.py
> @@ -1070,17 +1070,13 @@ class DeviceTree(object):
> description = device.description or device.model
> try:
> bypath = os.path.basename(deviceNameToDiskByPath(device.name))
> - details = "\n\nDevice details:\n%s" % (bypath,)
> except DeviceNotFoundError:
> # some devices don't have a /dev/disk/by-path/ #!@#@!@#
> bypath = device.name
> - details = ""
>
> initcb = lambda: self.intf.questionInitializeDisk(bypath,
> description,
> - device.size,
> - details)
> -
> + device.size)
> try:
> format = getFormat("disklabel",
> device=device.path,
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
