| 1 |
commit: 52cf00ececc1a10cea679b096fffccf708d3ba34 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 29 01:21:16 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Jul 29 01:21:16 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=52cf00ec |
| 7 |
|
| 8 |
Update the repositories.xml urls. |
| 9 |
|
| 10 |
--- |
| 11 |
etc/layman.cfg | 4 ++-- |
| 12 |
layman/config.py | 6 +++--- |
| 13 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/etc/layman.cfg b/etc/layman.cfg |
| 16 |
index 8a39ab9..11ae1be 100644 |
| 17 |
--- a/etc/layman.cfg |
| 18 |
+++ b/etc/layman.cfg |
| 19 |
@@ -65,13 +65,13 @@ gpg_signed_lists : |
| 20 |
# http://someserver.somewhere.com/someoverlays.xml http://someserver.somewhere.com/someoverlays.xml.gpg |
| 21 |
|
| 22 |
gpg_detached_lists : |
| 23 |
-# http://distfiles.gentoo.org/overlays.xml http://distfiles.gentoo.org/overlays.xml.asc |
| 24 |
+# https://api.gentoo.org/overlays/repositories.xml https://api.gentoo.org/overlays/repositories.xml.asc |
| 25 |
|
| 26 |
# original unsigned lists and definitions |
| 27 |
# one url per line, indented |
| 28 |
|
| 29 |
overlays : |
| 30 |
- http://www.gentoo.org/proj/en/overlays/repositories.xml |
| 31 |
+ https://api.gentoo.org/overlays/repositories.xml |
| 32 |
|
| 33 |
#----------------------------------------------------------- |
| 34 |
# The directory to scan for xml overlay definition files to include |
| 35 |
|
| 36 |
diff --git a/layman/config.py b/layman/config.py |
| 37 |
index bb15abb..77096e7 100644 |
| 38 |
--- a/layman/config.py |
| 39 |
+++ b/layman/config.py |
| 40 |
@@ -80,7 +80,7 @@ class BareConfig(object): |
| 41 |
|
| 42 |
>>> a = BareConfig() |
| 43 |
>>> a['overlays'] |
| 44 |
- 'http://www.gentoo.org/proj/en/overlays/repositories.xml' |
| 45 |
+ 'https://api.gentoo.org/overlays/repositories.xml' |
| 46 |
>>> sorted(a.keys()) |
| 47 |
['bzr_addopts', 'bzr_command', 'bzr_postsync', 'bzr_syncopts', 'cache', 'config', 'configdir', 'custom_news_func', 'custom_news_pkg', 'cvs_addopts', 'cvs_command', 'cvs_postsync', 'cvs_syncopts', 'darcs_addopts', 'darcs_command', 'darcs_postsync', 'darcs_syncopts', 'g-common_command', 'g-common_generateopts', 'g-common_postsync', 'g-common_syncopts', 'git_addopts', 'git_command', 'git_email', 'git_postsync', 'git_syncopts', 'git_user', 'installed', 'local_list', 'make_conf', 'mercurial_addopts', 'mercurial_command', 'mercurial_postsync', 'mercurial_syncopts', 'news_reporter', 'nocheck', 'nocolor', 'output', 'overlay_defs', 'overlays', 'proxy', 'quiet', 'quietness', 'rsync_command', 'rsync_postsync', 'rsync_syncopts', 'stderr', 'stdin', 'stdout', 'storage', 'svn_addopts', 'svn_command', 'svn_postsync', 'svn_syncopts', 't/f_options', 'tar_command', 'tar_postsync', 'umask', 'verbose', 'width'] |
| 48 |
>>> a.get_option('nocheck') |
| 49 |
@@ -105,10 +105,10 @@ class BareConfig(object): |
| 50 |
'umask' : '0022', |
| 51 |
'news_reporter': 'portage', |
| 52 |
'custom_news_pkg': '', |
| 53 |
- 'gpg_detached_lists': '', |
| 54 |
+ 'gpg_detached_lists': 'https://api.gentoo.org/overlays/repositories.xml https://api.gentoo.org/overlays/repositories.xml.asc', |
| 55 |
'gpg_signed_lists': '', |
| 56 |
'overlays' : |
| 57 |
- 'http://www.gentoo.org/proj/en/overlays/repositories.xml', |
| 58 |
+ 'https://api.gentoo.org/overlays/repositories.xml', |
| 59 |
'overlay_defs': '%(configdir)s/overlays', |
| 60 |
'bzr_command': path([self.root, EPREFIX,'/usr/bin/bzr']), |
| 61 |
'cvs_command': path([self.root, EPREFIX,'/usr/bin/cvs']), |
Archives