| 1 |
commit: 9c022fd0fe3d40a5c80e2362da48035d03f237f7 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 17 02:43:27 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 21 23:42:45 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c022fd0 |
| 7 |
|
| 8 |
repoamn/repos.py: Indent fix |
| 9 |
|
| 10 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 11 |
|
| 12 |
pym/repoman/repos.py | 46 +++++++++++++++++++++++----------------------- |
| 13 |
1 file changed, 23 insertions(+), 23 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py |
| 16 |
index de99fdf..f16bf7a 100644 |
| 17 |
--- a/pym/repoman/repos.py |
| 18 |
+++ b/pym/repoman/repos.py |
| 19 |
@@ -128,29 +128,29 @@ class RepoSettings(object): |
| 20 |
sys.exit(1) |
| 21 |
|
| 22 |
def _add_repo(self, config_root, portdir_overlay): |
| 23 |
- self.repo_conf = portage.repository.config |
| 24 |
- self.repo_name = self.repo_conf.RepoConfig._read_valid_repo_name( |
| 25 |
- portdir_overlay)[0] |
| 26 |
- self.layout_conf_data = self.repo_conf.parse_layout_conf(portdir_overlay)[0] |
| 27 |
- if self.layout_conf_data['repo-name']: |
| 28 |
- self.repo_name = self.layout_conf_data['repo-name'] |
| 29 |
- tmp_conf_file = io.StringIO(textwrap.dedent(""" |
| 30 |
- [%s] |
| 31 |
- location = %s |
| 32 |
- """) % (self.repo_name, portdir_overlay)) |
| 33 |
- # Ensure that the repository corresponding to $PWD overrides a |
| 34 |
- # repository of the same name referenced by the existing PORTDIR |
| 35 |
- # or PORTDIR_OVERLAY settings. |
| 36 |
- self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % ( |
| 37 |
- self.repoman_settings.get('PORTDIR_OVERLAY', ''), |
| 38 |
- portage._shell_quote(portdir_overlay)) |
| 39 |
- self.repositories = self.repo_conf.load_repository_config( |
| 40 |
- self.repoman_settings, extra_files=[tmp_conf_file]) |
| 41 |
- # We have to call the config constructor again so that attributes |
| 42 |
- # dependent on config.repositories are initialized correctly. |
| 43 |
- self.repoman_settings = portage.config( |
| 44 |
- config_root=config_root, local_config=False, |
| 45 |
- repositories=self.repositories) |
| 46 |
+ self.repo_conf = portage.repository.config |
| 47 |
+ self.repo_name = self.repo_conf.RepoConfig._read_valid_repo_name( |
| 48 |
+ portdir_overlay)[0] |
| 49 |
+ self.layout_conf_data = self.repo_conf.parse_layout_conf(portdir_overlay)[0] |
| 50 |
+ if self.layout_conf_data['repo-name']: |
| 51 |
+ self.repo_name = self.layout_conf_data['repo-name'] |
| 52 |
+ tmp_conf_file = io.StringIO(textwrap.dedent(""" |
| 53 |
+ [%s] |
| 54 |
+ location = %s |
| 55 |
+ """) % (self.repo_name, portdir_overlay)) |
| 56 |
+ # Ensure that the repository corresponding to $PWD overrides a |
| 57 |
+ # repository of the same name referenced by the existing PORTDIR |
| 58 |
+ # or PORTDIR_OVERLAY settings. |
| 59 |
+ self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % ( |
| 60 |
+ self.repoman_settings.get('PORTDIR_OVERLAY', ''), |
| 61 |
+ portage._shell_quote(portdir_overlay)) |
| 62 |
+ self.repositories = self.repo_conf.load_repository_config( |
| 63 |
+ self.repoman_settings, extra_files=[tmp_conf_file]) |
| 64 |
+ # We have to call the config constructor again so that attributes |
| 65 |
+ # dependent on config.repositories are initialized correctly. |
| 66 |
+ self.repoman_settings = portage.config( |
| 67 |
+ config_root=config_root, local_config=False, |
| 68 |
+ repositories=self.repositories) |
| 69 |
|
| 70 |
########## |
| 71 |
# future vcs plugin functions |
Archives