From bd5dc1971ab94c31d721d0df442b41e3eab2aca0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 22 Sep 2006 23:59:23 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - bugfixing in the useNetwork code --- DistUpgrade/DistUpgradeControler.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index c45a7da0..2d36e9cc 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -107,10 +107,7 @@ class DistUpgradeControler(object): self._view.updateStatus(_("Reading cache")) self.cache = None - try: - self.useNetwork = getattr(self.options,"withNetwork") - except AttributeError: - pass + self.useNetwork = getattr(self.options,"withNetwork",True) self.aptcdrom = AptCdrom(distUpgradeView, options.cdromPath) # the configuration @@ -143,7 +140,7 @@ class DistUpgradeControler(object): return False # FIXME: we may try to find out a bit more about the network # connection here and ask more inteligent questions - if self.aptcdrom and not hasattr(self,"useNetwork"): + if self.aptcdrom and not hasattr(self.options, "witheNetwork"): res = self._view.askYesNoQuestion(_("Fetch data from the network for the upgrade?"), _("The upgrade can use the network to check " "the latest updates and to fetch packages that are not on the " -- cgit v1.2.3