← Back to branch summary

~apw/update-manager/cdromupgrade-avoid-links

« back to all changes in this revision

Viewing changes to UpdateManager/Core/DistUpgradeFetcherCore.py

  • Committer: Michael Vogt
  • Date: 2009-01-27 08:08:42 UTC
  • Revision ID: michael.vogt@ubuntu.com-20090127080842-975q1e7jyilxhcs9
UpdateManager/Common/utils.py:
- moved from "Common" into "Core", the idea is to get rid of Common,
  the difference between it and "Core" is blured anyway
UpdateManager/Core/DistUpgradeFetcherCore.py:
- update import for utils
- fix bug in default_mirror calculation
UpdateManager/Core/MetaRelease.py:
- update import for utils
- get_dist() is now part of utils
UpdateManager/DistUpgradeFetcherKDE.py:
- update import for utils
- make the sleep a bit faster
UpdateManager/GtkProgress.py, UpdateManager/UpdateManager.py, 
UpdateManager/DistUpgradeFetcher.py, debian/update-manager-core.install, 
po/POTFILES.in:
- update import for utils

Show diffs side-by-side

added added

removed removed

Lines of Context:
UpdateManager/Core/DistUpgradeFetcherCore.py
34
34
import GnuPGInterface
35
35
from gettext import gettext as _
36
36
 
37
 
try:
38
 
  from utils import *
39
 
except Exception:
40
 
  from UpdateManager.Common.utils import *
 
37
from utils import *
41
38
 
42
39
class DistUpgradeFetcherCore(object):
43
40
    " base class (without GUI) for the upgrade fetcher "
174
171
        """
175
172
        # try to guess the mirror from the sources.list
176
173
        if uri.startswith(self.DEFAULT_MIRROR):
177
 
          new_uri = self.mirror_from_sources_list(uri, self.DEFAULT_URI)
 
174
          new_uri = self.mirror_from_sources_list(uri, self.DEFAULT_MIRROR)
178
175
          if new_uri:
179
176
            return new_uri
180
177