From fbd5c905d40afe5d78a2b9dafb246c1646af9c04 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 20 Mar 2010 12:10:31 +0000 Subject: [PATCH] Allow Fetcher.feed_mirror to be None to disable mirroring This is useful for 0mirror, to stop it falling back to itself ;-) --- zeroinstall/injector/fetch.py | 4 +++- zeroinstall/injector/model.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/zeroinstall/injector/fetch.py b/zeroinstall/injector/fetch.py index c43193e..518b3a4 100644 --- a/zeroinstall/injector/fetch.py +++ b/zeroinstall/injector/fetch.py @@ -89,7 +89,7 @@ class Fetcher(object): @ivar key_info_server: the base URL of a key information server @type key_info_server: str @ivar feed_mirror: the base URL of a mirror site for keys and feeds - @type feed_mirror: str + @type feed_mirror: str | None """ __slots__ = ['handler', 'feed_mirror', 'key_info_server', 'key_info'] @@ -145,6 +145,8 @@ class Fetcher(object): def get_feed_mirror(self, url): """Return the URL of a mirror for this feed.""" + if self.feed_mirror is None: + return None import urlparse if urlparse.urlparse(url).hostname == 'localhost': return None diff --git a/zeroinstall/injector/model.py b/zeroinstall/injector/model.py index 1b90cca..b0233a9 100644 --- a/zeroinstall/injector/model.py +++ b/zeroinstall/injector/model.py @@ -371,6 +371,7 @@ class Implementation(object): @type upstream_stability: [insecure | buggy | developer | testing | stable | packaged | preferred] @ivar langs: natural languages supported by this package @ivar requires: interfaces this package depends on + @type requires: [L{Dependency}] @ivar main: the default file to execute when running as a program @ivar metadata: extra metadata from the feed @type metadata: {"[URI ]localName": str} -- 2.11.4.GIT