summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-12 08:28:23 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-12 08:28:23 +0000
commita3c3df075de28adf4a51b2cc980abee15037bb06 (patch)
treea826f9ad47dfcbe9a7339f35be762124cfdc3676 /bin
parentIf necessary, use /proc/loadavg to emulate os.getloadavg(). (trunk r12422) (diff)
downloadportage-multirepo-a3c3df075de28adf4a51b2cc980abee15037bb06.tar.gz
portage-multirepo-a3c3df075de28adf4a51b2cc980abee15037bb06.tar.bz2
portage-multirepo-a3c3df075de28adf4a51b2cc980abee15037bb06.zip
Fix a TypeError which occurs in pretend commit mode when vcs is None. Thanks
to Fabian Groffen <grobian@g.o> for reporting. (trunk r12426) svn path=/main/branches/2.1.6/; revision=12479
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman
index 129a4296..c285bd6d 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2158,7 +2158,12 @@ else:
mymsg.write("\n (Unsigned Manifest commit)")
mymsg.close()
- commit_cmd = [vcs]
+ commit_cmd = []
+ if options.pretend and vcs is None:
+ # substitute a bogus value for pretend output
+ commit_cmd.append("cvs")
+ else:
+ commit_cmd.append(vcs)
commit_cmd.extend(vcs_global_opts)
commit_cmd.append("commit")
commit_cmd.extend(vcs_local_opts)