From f5552299f5c44bcdfacb9291d69f07b339c2d477 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 1 Apr 2011 11:47:23 +0200 Subject: [PATCH] Revert "Add --offline flag on CLI." This reverts commit 25b2c2dbcd59b96035b3439cf0d2b4956dfd2cdb. Not working properly. --- pakfire/__init__.py | 4 ++-- pakfire/cli.py | 6 ------ pakfire/repository/__init__.py | 4 ++-- pakfire/repository/base.py | 4 ++-- pakfire/repository/index.py | 21 +++++++++------------ pakfire/repository/remote.py | 4 ++-- 6 files changed, 17 insertions(+), 26 deletions(-) diff --git a/pakfire/__init__.py b/pakfire/__init__.py index 08d2d7bee..a049c457f 100644 --- a/pakfire/__init__.py +++ b/pakfire/__init__.py @@ -24,7 +24,7 @@ __version__ = PAKFIRE_VERSION class Pakfire(object): def __init__(self, path="/", builder=False, configs=[], - disable_repos=None, offline=False): + disable_repos=None): # Check if we are operating as the root user. self.check_root_user() @@ -73,7 +73,7 @@ class Pakfire(object): # Update all indexes of the repositories (not force) so that we will # always work with valid data. - self.repos.update(offline=offline) + self.repos.update() def check_root_user(self): if not os.getuid() == 0 or not os.getgid() == 0: diff --git a/pakfire/cli.py b/pakfire/cli.py index e60743088..2241fcc3d 100644 --- a/pakfire/cli.py +++ b/pakfire/cli.py @@ -63,7 +63,6 @@ class Cli(object): self.args.instroot, configs = [self.args.config], disable_repos = self.args.disable_repo, - offline = self.args.offline, ) self.action2func = { @@ -88,9 +87,6 @@ class Cli(object): self.parser.add_argument("--disable-repo", nargs="*", metavar="REPO", help=_("Disable a repository temporarily.")) - self.parser.add_argument("--offline", action="store_true", - help=_("Run in offline mode.")) - def parse_command_install(self): # Implement the "install" command. sub_install = self.sub_commands.add_parser("install", @@ -271,7 +267,6 @@ class CliBuilder(Cli): builder = True, configs = [self.args.config], disable_repos = self.args.disable_repo, - offline = self.args.offline, ) self.action2func = { @@ -414,7 +409,6 @@ class CliServer(Cli): builder = True, configs = [self.args.config], disable_repos = self.args.disable_repo, - offline = self.args.offline, ) self.action2func = { diff --git a/pakfire/repository/__init__.py b/pakfire/repository/__init__.py index 7bd25962c..ce943e440 100644 --- a/pakfire/repository/__init__.py +++ b/pakfire/repository/__init__.py @@ -86,12 +86,12 @@ class Repositories(object): repo.enabled = False continue - def update(self, force=False, offline=False): + def update(self, force=False): logging.debug("Updating all repository indexes (force=%s)" % force) # XXX update all indexes if necessary or forced for repo in self.enabled: - repo.update(force=force, offline=offline) + repo.update(force=force) #def get_all(self): # for repo in self.enabled: diff --git a/pakfire/repository/base.py b/pakfire/repository/base.py index bf8ce54ec..e6d4e9afe 100644 --- a/pakfire/repository/base.py +++ b/pakfire/repository/base.py @@ -39,13 +39,13 @@ class RepositoryFactory(object): """ return False - def update(self, force=False, offline=False): + def update(self, force=False): """ A function that is called to update the local data of the repository. """ if hasattr(self, "index"): - self.index.update(force, offline=offline) + self.index.update(force) def get_all(self): """ diff --git a/pakfire/repository/index.py b/pakfire/repository/index.py index 776cf29b4..f18c97d95 100644 --- a/pakfire/repository/index.py +++ b/pakfire/repository/index.py @@ -64,7 +64,7 @@ class Index(object): for pkg in self._packages: yield pkg - def update(self, force=False, offline=False): + def update(self, force=False): pass def add_package(self, pkg): @@ -82,7 +82,7 @@ class DirectoryIndex(Index): # Always update this because it will otherwise contain no data self.update(force=True) - def update(self, force=False, offline=False): + def update(self, force=False): logging.debug("Updating repository index '%s' (force=%s)" % (self.path, force)) # Do nothing if the update is not forced but populate the database @@ -241,16 +241,16 @@ class LocalIndex(DatabaseIndexFactory): class RemoteIndex(DatabaseIndexFactory): def open_database(self): - self.update(force=False, offline=True) + self.update(force=False) - def _update_metadata(self, force, offline): + def _update_metadata(self, force): # Shortcut to repository cache. cache = self.repo.cache filename = os.path.join(METADATA_DOWNLOAD_PATH, METADATA_DOWNLOAD_FILE) # Marker if we need to do the download. - download = not offline + download = True # Marker for the current metadata. old_metadata = None @@ -292,7 +292,7 @@ class RemoteIndex(DatabaseIndexFactory): self.metadata = metadata.Metadata(self.pakfire, self, cache.abspath(filename)) - def _update_database(self, force, offline): + def _update_database(self, force): # Shortcut to repository cache. cache = self.repo.cache @@ -300,9 +300,6 @@ class RemoteIndex(DatabaseIndexFactory): filename = os.path.join(METADATA_DOWNLOAD_PATH, self.metadata.database) if not cache.exists(filename): - if offline: - raise Exception, "No database. Cannot download one in offline mode..." - # Initialize a grabber for download. grabber = downloader.DatabaseDownloader( text = _("%s: package database") % self.repo.name, @@ -336,7 +333,7 @@ class RemoteIndex(DatabaseIndexFactory): self.db = database.RemotePackageDatabase(self.pakfire, cache.abspath(filename)) - def update(self, force=False, offline=False): + def update(self, force=False): """ Download the repository metadata and the package database. """ @@ -346,10 +343,10 @@ class RemoteIndex(DatabaseIndexFactory): return # At first, update the metadata. - self._update_metadata(force, offline) + self._update_metadata(force) # Then, we download the database eventually. - self._update_database(force, offline) + self._update_database(force) # XXX this code needs lots of work: # XXX * check the metadata content diff --git a/pakfire/repository/remote.py b/pakfire/repository/remote.py index 1b57d1027..c2ffcff1a 100644 --- a/pakfire/repository/remote.py +++ b/pakfire/repository/remote.py @@ -76,9 +76,9 @@ class RemoteRepository(RepositoryFactory): return priority - def update(self, force=False, offline=False): + def update(self, force=False): if self.index: - self.index.update(force=force, offline=offline) + self.index.update(force=force) def _replace_from_cache(self, pkg): for _pkg in self.cache.packages: -- 2.39.5