[paludis-commits] paludis.git (0.28) -- 64e98aa by David Leverton

[git at git.pioto.org]

Module:    paludis.git
Branch:    0.28
Commit:    64e98aa2f6e49e46ee78af7ad784efa12edf2187
URL:       http://git.pioto.org/?p=paludis.git;a=commit;h=64e98aa2f6e49e46ee78af7ad784efa12edf2187

Author:    David Leverton <levertond at googlemail.com>
Committer: David Leverton <levertond at googlemail.com>
Date:      Mon Aug  4 15:17:33 2008 +0100

----

Fix RESTRICT="mirror"

----

 paludis/repositories/e/e_key.cc             |    6 +++---
 paludis/repositories/e/eapis/0.conf         |    2 +-
 paludis/repositories/e/eapis/exheres-0.conf |    2 +-
 paludis/repositories/e/eapis/paludis-1.conf |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 92ad0b4..a968df1 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 3bcac91..3621a66 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 3b72c37..473e739 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 f242ec8..ea27824 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 ; \
---