summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-04-28 21:26:45 -0700
committerZac Medico <zmedico@gentoo.org>2013-04-28 21:26:45 -0700
commit2bdc5c1230c8684e602f889e8b434a48b9c1701a (patch)
tree511816ef3974df8a88f8cf9fd4d0782923729e15
parenttests: clean up style a bit (mostly poor/inconsistent spacing) (diff)
downloadportage-2bdc5c1230c8684e602f889e8b434a48b9c1701a.tar.gz
portage-2bdc5c1230c8684e602f889e8b434a48b9c1701a.tar.bz2
portage-2bdc5c1230c8684e602f889e8b434a48b9c1701a.zip
repoman: report --ignore/include-arches commits
-rwxr-xr-xbin/repoman17
1 files changed, 13 insertions, 4 deletions
diff --git a/bin/repoman b/bin/repoman
index ca4fb533e..a8293345a 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2680,11 +2680,20 @@ else:
sys.stderr.flush()
portage_version = "Unknown"
+ report_options = []
+ if options.force:
+ report_options.append("--force")
+ if options.ignore_arches:
+ report_options.append("--ignore-arches")
+ if include_arches is not None:
+ report_options.append("--include-arches=\"%s\"" %
+ " ".join(sorted(include_arches)))
+
if vcs == "git":
# Use new footer only for git (see bug #438364).
commit_footer = "\n\nPackage-Manager: portage-%s" % portage_version
- if options.force:
- commit_footer += "\nRepoMan-Options: --force"
+ if report_options:
+ commit_footer += "\nRepoMan-Options: " + " ".join(report_options)
if sign_manifests:
commit_footer += "\nManifest-Sign-Key: %s" % (gpg_key, )
if dco_sob:
@@ -2700,8 +2709,8 @@ else:
commit_footer += "Signed-off-by: %s\n" % (dco_sob, )
commit_footer += "(Portage version: %s/%s/%s" % \
(portage_version, vcs, unameout)
- if options.force:
- commit_footer += ", RepoMan options: --force"
+ if report_options:
+ commit_footer += ", RepoMan options: " + " ".join(report_options)
if sign_manifests:
commit_footer += ", signed Manifest commit with key %s" % \
(gpg_key, )