summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-04-03 05:07:56 +0000
committerAlec Warner <antarus@gentoo.org>2006-04-03 05:07:56 +0000
commit4cea82a8e48d1cee3c6cf8a02b15ff6e9cec863d (patch)
treed58583e526a8071db5ec05aad3047a3e96314401
parent8756978bbd5809f25432d78929a0e6ef63544b3a (diff)
downloadportage-4cea82a8e48d1cee3c6cf8a02b15ff6e9cec863d.tar.gz
portage-4cea82a8e48d1cee3c6cf8a02b15ff6e9cec863d.tar.bz2
portage-4cea82a8e48d1cee3c6cf8a02b15ff6e9cec863d.zip
Fixes for repoman thanks to exg@gentoo.org and bug #128451, Excludes Manifest regeneration in certain cases, adds pretend gpg outut
svn path=/main/trunk/; revision=3062
-rwxr-xr-xbin/repoman18
1 files changed, 12 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman
index a17cf9fa4..f72996e15 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1511,6 +1511,8 @@ else:
if isCvs:
mycvstree=cvstree.getentries("./",recursive=1)
mychanged=cvstree.findchanged(mycvstree,recursive=1,basedir="./")
+ for manifest in [file for file in mychanged if 'Manifest' in file]:
+ mychanged.remove(manifest)
mynew=cvstree.findnew(mycvstree,recursive=1,basedir="./")
myremoved=cvstree.findremoved(mycvstree,recursive=1,basedir="./")
if not (mychanged or mynew or myremoved):
@@ -1566,10 +1568,10 @@ else:
print
if "--pretend" in myoptions:
- print "(/usr/bin/cvs -q commit -F "+commitmessagefile+")"
+ print "(/usr/bin/cvs -q commit "+string.join(myupdates," ")+" -F "+commitmessagefile+")"
retval=0
else:
- retval=os.system("/usr/bin/cvs -q commit -F "+commitmessagefile)
+ retval=os.system("/usr/bin/cvs -q commit "+string.join(myupdates, " ")+" -F "+commitmessagefile)
if retval:
print "!!! Exiting on cvs (shell) error code:",retval
sys.exit(retval)
@@ -1580,11 +1582,15 @@ else:
gpgcmd+= "--default-key "+repoman_settings["PORTAGE_GPG_KEY"]
if repoman_settings.has_key("PORTAGE_GPG_DIR"):
gpgcmd += " --homedir "+repoman_settings["PORTAGE_GPG_DIR"]
- rValue = os.system(gpgcmd+" "+filename)
- if rValue == 0:
- os.rename(filename+".asc", filename)
+ if "--pretend" in myoptions:
+ print "("+gpgcmd+" "+filename+")"
+ rValue = 0
else:
- print "!!! gpg exited with '" + str(rValue) + "' status"
+ rValue = os.system(gpgcmd+" "+filename)
+ if rValue == 0:
+ os.rename(filename+".asc", filename)
+ else:
+ print "!!! gpg exited with '" + str(rValue) + "' status"
return rValue
if myheaders or myupdates or myremoved or mynew: