From b36a8669d426dcd7ca5fabdfacbdae22d268bc97 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 12 Mar 2013 21:09:54 +0000 Subject: [PATCH] [conf] drop the "remote web services server url" part from repository "repo =" param This has been deprecated for long time. --- conf/repositories.conf.d/_entropy_sabayon-limbo.example | 4 ++-- conf/repositories.conf.d/entropy_sabayonlinux.org.example | 4 ++-- lib/entropy/core/settings/base.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/repositories.conf.d/_entropy_sabayon-limbo.example b/conf/repositories.conf.d/_entropy_sabayon-limbo.example index 7a36758b0..ba0d20d89 100644 --- a/conf/repositories.conf.d/_entropy_sabayon-limbo.example +++ b/conf/repositories.conf.d/_entropy_sabayon-limbo.example @@ -5,7 +5,7 @@ # # [repository-id] # desc = Sabayon Linux Official Testing Repository -# repo = http://pkg.sabayon.org,sabayon.org +# repo = http://pkg.sabayon.org # pkg = http://pkg.sabayon.org # pkg = http://dl.sabayon.org/entropy # enabled = @@ -25,7 +25,7 @@ # - "desc": stands for description, the repository name description. # - "repo": the repository database URL string, plus other parameters # as supported in the previous configuration file syntax: -# [,]. +# [#]. # - "pkg": the repository packages URL string. This must be a valid URL. # The supported protocols are those supported by entropy.fetchers. # - "enabled": if set, its value can be either "true" or "false". The default diff --git a/conf/repositories.conf.d/entropy_sabayonlinux.org.example b/conf/repositories.conf.d/entropy_sabayonlinux.org.example index 0c34015cd..ee7943780 100644 --- a/conf/repositories.conf.d/entropy_sabayonlinux.org.example +++ b/conf/repositories.conf.d/entropy_sabayonlinux.org.example @@ -5,7 +5,7 @@ # # [repository-id] # desc = Sabayon Linux Official Testing Repository -# repo = http://pkg.sabayon.org,sabayon.org +# repo = http://pkg.sabayon.org # pkg = http://pkg.sabayon.org # pkg = http://dl.sabayon.org/entropy # enabled = @@ -25,7 +25,7 @@ # - "desc": stands for description, the repository name description. # - "repo": the repository database URL string, plus other parameters # as supported in the previous configuration file syntax: -# [,]. +# [#]. # - "pkg": the repository packages URL string. This must be a valid URL. # The supported protocols are those supported by entropy.fetchers. # - "enabled": if set, its value can be either "true" or "false". The default diff --git a/lib/entropy/core/settings/base.py b/lib/entropy/core/settings/base.py index c99b3273d..2fd494ff1 100644 --- a/lib/entropy/core/settings/base.py +++ b/lib/entropy/core/settings/base.py @@ -48,7 +48,7 @@ class RepositoryConfigParser(BaseConfigParser): [sabayon-limbo] desc = Sabayon Linux Official Testing Repository - repo = http://pkg.sabayon.org,sabayon.org + repo = http://pkg.sabayon.org pkg = http://pkg.sabayon.org pkg = http://dl.sabayon.org/entropy enabled = @@ -68,7 +68,7 @@ class RepositoryConfigParser(BaseConfigParser): - "desc": stands for description, the repository name description. - "repo": the repository database URL string, plus other parameters as supported in the previous configuration file syntax: - [,]. + [#]. - "pkg": the repository packages URL string. This must be a valid URL. The supported protocols are those supported by entropy.fetchers. - "enabled": if set, its value can be either "true" or "false". The default