aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-04 15:17:33 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-04 15:17:33 +0100
commit8788d8f54896ebbbd11411c8320e2ce65db026c1 (patch)
tree5f72429f93af142c63d9a93701b584f57175176f
parentd7ee26456cc76bf76c0e77b23b1d7ba6967008a2 (diff)
downloadpaludis-8788d8f54896ebbbd11411c8320e2ce65db026c1.tar.gz
paludis-8788d8f54896ebbbd11411c8320e2ce65db026c1.tar.xz
Fix RESTRICT="mirror"
-rw-r--r--paludis/repositories/e/e_key.cc6
-rw-r--r--paludis/repositories/e/eapis/0.conf2
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf2
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf2
4 files changed, 6 insertions, 6 deletions
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index df4e30c..c318775 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -314,9 +314,9 @@ EFetchableURIKey::initial_label() const
_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end(), (*i)->text()))
_imp->initial_label = *parse_uri_label("default-restrict-fetch:", *_imp->id->eapi())->begin();
- else if (_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end() !=
- std::find(_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->begin(),
- _imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end(), (*i)->text()))
+ else if (_imp->id->eapi()->supported()->ebuild_options()->restrict_mirror()->end() !=
+ std::find(_imp->id->eapi()->supported()->ebuild_options()->restrict_mirror()->begin(),
+ _imp->id->eapi()->supported()->ebuild_options()->restrict_mirror()->end(), (*i)->text()))
_imp->initial_label = *parse_uri_label("default-restrict-mirror:", *_imp->id->eapi())->begin();
else if (_imp->id->eapi()->supported()->ebuild_options()->restrict_primaryuri()->end() !=
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 0bd8dc5..33faa29 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -192,7 +192,7 @@ dependency_labels =
uri_labels = \
default = URIMirrorsThenListedLabel ; \
default-restrict-fetch = URIManualOnlyLabel ; \
- default-restrict-mirror = URILocalMirrorsOnlyLabel ; \
+ default-restrict-mirror = URIListedOnlyLabel ; \
default-restrict-primaryuri = URIListedThenMirrorsLabel
restrict_mirror = mirror nomirror
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 6960085..dfa1d43 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -195,7 +195,7 @@ env_distdir = FETCHEDDIR
uri_labels = \
default = URIListedThenMirrorsLabel ; \
default-restrict-fetch = URIManualOnlyLabel ; \
- default-restrict-mirror = URILocalMirrorsOnlyLabel ; \
+ default-restrict-mirror = URIListedOnlyLabel ; \
mirrors-first = URIMirrorsThenListedLabel ; \
mirrors-only = URIMirrorsOnlyLabel ; \
listed-only = URIListedOnlyLabel ; \
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 9e7f0e4..5559de5 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -195,7 +195,7 @@ env_distdir = DISTDIR
uri_labels = \
default = URIListedThenMirrorsLabel ; \
default-restrict-fetch = URIManualOnlyLabel ; \
- default-restrict-mirror = URILocalMirrorsOnlyLabel
+ default-restrict-mirror = URIListedOnlyLabel
dependency_labels = \
host = DependencyHostLabel ; \