| 1 |
commit: 8fcbc2c7244dfa53008501df760efdfbf48ef999 |
| 2 |
Author: Tom Wijsman <tomwij <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 2 18:28:34 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Oct 1 23:45:33 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8fcbc2c7 |
| 7 |
|
| 8 |
repoman: Fix up commit imports and calls |
| 9 |
|
| 10 |
--- |
| 11 |
pym/repoman/argparser.py | 3 ++- |
| 12 |
pym/repoman/copyrights.py | 2 +- |
| 13 |
pym/repoman/main.py | 24 ++++++++++++++---------- |
| 14 |
pym/repoman/modules/commit/repochecks.py | 3 ++- |
| 15 |
4 files changed, 19 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py |
| 18 |
index 19ec6e9..393d755 100644 |
| 19 |
--- a/pym/repoman/argparser.py |
| 20 |
+++ b/pym/repoman/argparser.py |
| 21 |
@@ -6,6 +6,7 @@ |
| 22 |
|
| 23 |
import logging |
| 24 |
import portage |
| 25 |
+import sys |
| 26 |
from portage import util |
| 27 |
from portage.util._argparse import ArgumentParser |
| 28 |
|
| 29 |
@@ -167,7 +168,7 @@ def parse_args(argv, qahelp, repoman_default_opts): |
| 30 |
opts, args = parser.parse_known_args(argv[1:]) |
| 31 |
|
| 32 |
if not opts.ignore_default_opts: |
| 33 |
- default_opts = portage.util.shlex_split(repoman_default_opts) |
| 34 |
+ default_opts = util.shlex_split(repoman_default_opts) |
| 35 |
if default_opts: |
| 36 |
opts, args = parser.parse_known_args(default_opts + sys.argv[1:]) |
| 37 |
|
| 38 |
|
| 39 |
diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py |
| 40 |
index 231857f..01ce42f 100644 |
| 41 |
--- a/pym/repoman/copyrights.py |
| 42 |
+++ b/pym/repoman/copyrights.py |
| 43 |
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False): |
| 44 |
new_header.append(line) |
| 45 |
break |
| 46 |
|
| 47 |
- line = _update_copyright_year(year, line) |
| 48 |
+ line = update_copyright_year(year, line) |
| 49 |
new_header.append(line) |
| 50 |
|
| 51 |
difflines = 0 |
| 52 |
|
| 53 |
diff --git a/pym/repoman/main.py b/pym/repoman/main.py |
| 54 |
index 9ce3c18..d567f94 100755 |
| 55 |
--- a/pym/repoman/main.py |
| 56 |
+++ b/pym/repoman/main.py |
| 57 |
@@ -56,7 +56,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid |
| 58 |
from repoman.checks.ebuilds.pkgmetadata import PkgMetadata |
| 59 |
from repoman.ebuild import Ebuild |
| 60 |
from repoman.errors import err |
| 61 |
-from repoman.modules import commit |
| 62 |
+from repoman.modules.commit import repochecks |
| 63 |
from repoman.profile import check_profiles, dev_keywords, setup_profile |
| 64 |
from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp, |
| 65 |
qawarnings, qacats, max_desc_len, missingvars, |
| 66 |
@@ -187,8 +187,8 @@ repolevel = len(reposplit) |
| 67 |
################### |
| 68 |
|
| 69 |
if options.mode == 'commit': |
| 70 |
- commit.repochecks.commit_check(repolevel, reposplit) |
| 71 |
- commit.repochecks.conflict_check(vcs_settings, options) |
| 72 |
+ repochecks.commit_check(repolevel, reposplit) |
| 73 |
+ repochecks.conflict_check(vcs_settings, options) |
| 74 |
|
| 75 |
################### |
| 76 |
|
| 77 |
@@ -265,7 +265,8 @@ check_ebuild_notadded = not \ |
| 78 |
effective_scanlist = scanlist |
| 79 |
if options.if_modified == "y": |
| 80 |
effective_scanlist = sorted(vcs_files_to_cps( |
| 81 |
- chain(changed.changed, changed.new, changed.removed))) |
| 82 |
+ chain(changed.changed, changed.new, changed.removed), |
| 83 |
+ repolevel, reposplit, categories)) |
| 84 |
|
| 85 |
for xpkg in effective_scanlist: |
| 86 |
# ebuilds and digests added to cvs respectively. |
| 87 |
@@ -1266,7 +1267,8 @@ else: |
| 88 |
else: |
| 89 |
commitmessage = utilities.get_commit_message_with_stdin() |
| 90 |
except KeyboardInterrupt: |
| 91 |
- exithandler() |
| 92 |
+ logging.fatal("Interrupted; exiting...") |
| 93 |
+ sys.exit(1) |
| 94 |
if not commitmessage or not commitmessage.strip(): |
| 95 |
print("* no commit message? aborting commit.") |
| 96 |
sys.exit(1) |
| 97 |
@@ -1326,7 +1328,8 @@ else: |
| 98 |
logging.info("checking for unmodified ChangeLog files") |
| 99 |
committer_name = utilities.get_committer_name(env=repoman_settings) |
| 100 |
for x in sorted(vcs_files_to_cps( |
| 101 |
- chain(myupdates, mymanifests, myremoved))): |
| 102 |
+ chain(myupdates, mymanifests, myremoved), |
| 103 |
+ repolevel, reposplit, categories)): |
| 104 |
catdir, pkgdir = x.split("/") |
| 105 |
checkdir = repo_settings.repodir + "/" + x |
| 106 |
checkdir_relative = "" |
| 107 |
@@ -1466,7 +1469,7 @@ else: |
| 108 |
|
| 109 |
print("%s have headers that will change." % green(str(len(myheaders)))) |
| 110 |
print( |
| 111 |
- "* Files with headers will " |
| 112 |
+ "* Files with headers will" |
| 113 |
" cause the manifests to be changed and committed separately.") |
| 114 |
|
| 115 |
logging.info("myupdates: %s", myupdates) |
| 116 |
@@ -1621,9 +1624,9 @@ else: |
| 117 |
"doing the entire repository.\"\n") |
| 118 |
|
| 119 |
if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved): |
| 120 |
- |
| 121 |
for x in sorted(vcs_files_to_cps( |
| 122 |
- chain(myupdates, myremoved, mymanifests))): |
| 123 |
+ chain(myupdates, myremoved, mymanifests), |
| 124 |
+ repolevel, reposplit, categories)): |
| 125 |
repoman_settings["O"] = os.path.join(repo_settings.repodir, x) |
| 126 |
digestgen(mysettings=repoman_settings, myportdb=portdb) |
| 127 |
|
| 128 |
@@ -1637,7 +1640,8 @@ else: |
| 129 |
signed = True |
| 130 |
try: |
| 131 |
for x in sorted(vcs_files_to_cps( |
| 132 |
- chain(myupdates, myremoved, mymanifests))): |
| 133 |
+ chain(myupdates, myremoved, mymanifests), |
| 134 |
+ repolevel, reposplit, categories)): |
| 135 |
repoman_settings["O"] = os.path.join(repo_settings.repodir, x) |
| 136 |
manifest_path = os.path.join(repoman_settings["O"], "Manifest") |
| 137 |
if not need_signature(manifest_path): |
| 138 |
|
| 139 |
diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py |
| 140 |
index ac4db6b..d0e2f28 100644 |
| 141 |
--- a/pym/repoman/modules/commit/repochecks.py |
| 142 |
+++ b/pym/repoman/modules/commit/repochecks.py |
| 143 |
@@ -3,7 +3,8 @@ |
| 144 |
from portage.output import red |
| 145 |
|
| 146 |
from repoman.errors import err |
| 147 |
-from repoman.vcs import detect_vcs_conflicts |
| 148 |
+from repoman.vcs import vcs |
| 149 |
+from repoman.vcs.vcs import detect_vcs_conflicts |
| 150 |
|
| 151 |
|
| 152 |
def commit_check(repolevel, reposplit): |
Archives