| 1 |
commit: e5c1c0899f0cf8e1331a1e523a27703fe84fb8c9 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 17 04:06:24 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=e5c1c089 |
| 7 |
|
| 8 |
repoman: Change name of dev_keywords() due to variable name conflict |
| 9 |
|
| 10 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 11 |
|
| 12 |
pym/repoman/main.py | 4 ++-- |
| 13 |
pym/repoman/profile.py | 2 +- |
| 14 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/repoman/main.py b/pym/repoman/main.py |
| 17 |
index e276aba..006afc9 100755 |
| 18 |
--- a/pym/repoman/main.py |
| 19 |
+++ b/pym/repoman/main.py |
| 20 |
@@ -68,7 +68,7 @@ from repoman.ebuild import Ebuild |
| 21 |
from repoman.errors import err |
| 22 |
from repoman.gpg import gpgsign, need_signature |
| 23 |
from repoman.modules.commit import repochecks |
| 24 |
-from repoman.profile import check_profiles, dev_keywords, setup_profile |
| 25 |
+from repoman.profile import check_profiles, dev_profile_keywords, setup_profile |
| 26 |
from repoman.qa_data import ( |
| 27 |
format_qa_output, format_qa_output_column, qahelp, |
| 28 |
qawarnings, qacats, missingvars, |
| 29 |
@@ -243,7 +243,7 @@ scanlist = scan(repolevel, reposplit, startdir, categories, repo_settings) |
| 30 |
|
| 31 |
#################### |
| 32 |
|
| 33 |
-dev_keywords = dev_keywords(profiles) |
| 34 |
+dev_keywords = dev_profile_keywords(profiles) |
| 35 |
|
| 36 |
qatracker = QATracker() |
| 37 |
|
| 38 |
|
| 39 |
diff --git a/pym/repoman/profile.py b/pym/repoman/profile.py |
| 40 |
index 11b93c7..0aedbe8 100644 |
| 41 |
--- a/pym/repoman/profile.py |
| 42 |
+++ b/pym/repoman/profile.py |
| 43 |
@@ -28,7 +28,7 @@ class ProfileDesc(object): |
| 44 |
valid_profile_types = frozenset(['dev', 'exp', 'stable']) |
| 45 |
|
| 46 |
|
| 47 |
-def dev_keywords(profiles): |
| 48 |
+def dev_profile_keywords(profiles): |
| 49 |
""" |
| 50 |
Create a set of KEYWORDS values that exist in 'dev' |
| 51 |
profiles. These are used |
Archives