summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-11 19:42:13 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-11 19:42:13 +0000
commit50aa6d34ab3469cd1f3ed16da3488f7a2aa1a8e4 (patch)
tree1c6bab26f386ca2a0be285d6e286111b3ba31cea
parentIf necessary, use /proc/loadavg to emulate os.getloadavg(). (diff)
downloadportage-multirepo-50aa6d34ab3469cd1f3ed16da3488f7a2aa1a8e4.tar.gz
portage-multirepo-50aa6d34ab3469cd1f3ed16da3488f7a2aa1a8e4.tar.bz2
portage-multirepo-50aa6d34ab3469cd1f3ed16da3488f7a2aa1a8e4.zip
Fix a TypeError which occurs in pretend commit mode when vcs is None. Thanks
to Fabian Groffen <grobian@g.o> for reporting. svn path=/main/trunk/; revision=12426
-rwxr-xr-xbin/repoman7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman
index 72693929..1d6ef75d 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)