commit: 9c022fd0fe3d40a5c80e2362da48035d03f237f7
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 02:43:27 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 23:42:45 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c022fd0
repoamn/repos.py: Indent fix
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
pym/repoman/repos.py | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index de99fdf..f16bf7a 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -128,29 +128,29 @@ class RepoSettings(object):
sys.exit(1)
def _add_repo(self, config_root, portdir_overlay):
- self.repo_conf = portage.repository.config
- self.repo_name =
self.repo_conf.RepoConfig._read_valid_repo_name(
- portdir_overlay)[0]
- self.layout_conf_data =
self.repo_conf.parse_layout_conf(portdir_overlay)[0]
- if self.layout_conf_data['repo-name']:
- self.repo_name =
self.layout_conf_data['repo-name']
- tmp_conf_file = io.StringIO(textwrap.dedent("""
- [%s]
- location = %s
- """) % (self.repo_name, portdir_overlay))
- # Ensure that the repository corresponding to $PWD
overrides a
- # repository of the same name referenced by the
existing PORTDIR
- # or PORTDIR_OVERLAY settings.
- self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % (
- self.repoman_settings.get('PORTDIR_OVERLAY',
''),
- portage._shell_quote(portdir_overlay))
- self.repositories =
self.repo_conf.load_repository_config(
- self.repoman_settings,
extra_files=[tmp_conf_file])
- # We have to call the config constructor again so that
attributes
- # dependent on config.repositories are initialized
correctly.
- self.repoman_settings = portage.config(
- config_root=config_root, local_config=False,
- repositories=self.repositories)
+ self.repo_conf = portage.repository.config
+ self.repo_name =
self.repo_conf.RepoConfig._read_valid_repo_name(
+ portdir_overlay)[0]
+ self.layout_conf_data =
self.repo_conf.parse_layout_conf(portdir_overlay)[0]
+ if self.layout_conf_data['repo-name']:
+ self.repo_name = self.layout_conf_data['repo-name']
+ tmp_conf_file = io.StringIO(textwrap.dedent("""
+ [%s]
+ location = %s
+ """) % (self.repo_name, portdir_overlay))
+ # Ensure that the repository corresponding to $PWD overrides a
+ # repository of the same name referenced by the existing PORTDIR
+ # or PORTDIR_OVERLAY settings.
+ self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % (
+ self.repoman_settings.get('PORTDIR_OVERLAY', ''),
+ portage._shell_quote(portdir_overlay))
+ self.repositories = self.repo_conf.load_repository_config(
+ self.repoman_settings, extra_files=[tmp_conf_file])
+ # We have to call the config constructor again so that
attributes
+ # dependent on config.repositories are initialized correctly.
+ self.repoman_settings = portage.config(
+ config_root=config_root, local_config=False,
+ repositories=self.repositories)
##########
# future vcs plugin functions
