summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-07 17:59:24 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-07 17:59:24 +0000
commit349d805c67c941a86a263193e3f383d26818d7b1 (patch)
tree7975d1872e89456d0addd2bb8b974cd16f197695 /bin/repoman
parentDon't swallow an IOError if it is thrown from the aux_get call in portdbapi.g... (diff)
downloadportage-multirepo-349d805c67c941a86a263193e3f383d26818d7b1.tar.gz
portage-multirepo-349d805c67c941a86a263193e3f383d26818d7b1.tar.bz2
portage-multirepo-349d805c67c941a86a263193e3f383d26818d7b1.zip
Don't automatically fix digests in --pretend mode.
svn path=/main/trunk/; revision=5480
Diffstat (limited to 'bin/repoman')
-rwxr-xr-xbin/repoman7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 60aa4d9d..3be93d7a 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -401,7 +401,9 @@ myreporoot=None
if os.path.isdir("CVS"):
isCvs = True
-if not "--pretend" in myoptions and not isCvs:
+if mymode == "commit" and \
+ not isCvs and \
+ "--pretend" not in myoptions:
print
print darkgreen("Not in a CVS repository; enabling pretend mode.")
myoptions.append("--pretend");
@@ -814,7 +816,8 @@ for x in scanlist:
fails["CVS/Entries.IO_error"].append(checkdir+"/files/CVS/Entries")
continue
- if mymode in ("fix", "commit"):
+ if mymode in ("fix", "commit") and \
+ "--pretend" not in myoptions:
repoman_settings["O"] = checkdir
if not portage.digestgen([], repoman_settings, myportdb=portdb):
print "Unable to generate manifest."