| 1 |
commit: d88cf4746c0fe891087a79d630e9d8181c7cbd04 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 2 18:30:31 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 2 18:34:02 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d88cf474 |
| 7 |
|
| 8 |
portage/repository/config.py: Deprecate make.conf SYNC variable bug 538512 |
| 9 |
|
| 10 |
Newer mirrorselect modifies repos.conf, no need for this anymore. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/portage/repository/config.py | 14 ++++++++++---- |
| 14 |
1 file changed, 10 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 17 |
index f80742e..6d79452 100644 |
| 18 |
--- a/pym/portage/repository/config.py |
| 19 |
+++ b/pym/portage/repository/config.py |
| 20 |
@@ -606,10 +606,12 @@ class RepoConfigLoader(object): |
| 21 |
if "PORTAGE_REPOSITORIES" in settings: |
| 22 |
portdir = "" |
| 23 |
portdir_overlay = "" |
| 24 |
+ # depercated portdir_sync |
| 25 |
portdir_sync = "" |
| 26 |
else: |
| 27 |
portdir = settings.get("PORTDIR", "") |
| 28 |
portdir_overlay = settings.get("PORTDIR_OVERLAY", "") |
| 29 |
+ # depercated portdir_sync |
| 30 |
portdir_sync = settings.get("SYNC", "") |
| 31 |
|
| 32 |
try: |
| 33 |
@@ -734,11 +736,15 @@ class RepoConfigLoader(object): |
| 34 |
# This happens if main-repo has been set in repos.conf. |
| 35 |
prepos[main_repo].priority = -1000 |
| 36 |
|
| 37 |
- # Backward compatible SYNC support for mirrorselect. |
| 38 |
+ # DEPRECATED Backward compatible SYNC support for old mirrorselect. |
| 39 |
+ # Feb. 2, 2015. Version 2.0.16 |
| 40 |
if portdir_sync and main_repo is not None: |
| 41 |
- if portdir_sync.startswith("rsync://"): |
| 42 |
- prepos[main_repo].sync_uri = portdir_sync |
| 43 |
- prepos[main_repo].sync_type = "rsync" |
| 44 |
+ writemsg(_("!!! SYNC setting found in make.conf.\n " |
| 45 |
+ "This setting is Deprecated and no longer used. " |
| 46 |
+ "Please ensure your 'sync-type' and 'sync-uri' are set correctly" |
| 47 |
+ " in repos.conf/gentoo.conf\n"), |
| 48 |
+ noiselevel=-1) |
| 49 |
+ |
| 50 |
|
| 51 |
# Include repo.name in sort key, for predictable sorting |
| 52 |
# even when priorities are equal. |
Archives