From d50654536b31689ffee8f735de21404a07c1784c Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 24 Oct 2007 14:45:58 +0000 Subject: [PATCH] Fix: Make repoman actually USE -m commit message again (and -M commit message file). This should probably be back propagated to the trunk as well. svn path=/main/branches/prefix/; revision=8280 --- bin/repoman | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/repoman b/bin/repoman index 8dbc8dabd..9b3551c52 100755 --- a/bin/repoman +++ b/bin/repoman @@ -330,7 +330,6 @@ qawarnings=[ missingvars=["KEYWORDS","LICENSE","DESCRIPTION","HOMEPAGE","SLOT"] allvars=portage.auxdbkeys commitmessage=None -commitmessagefile=None for x in missingvars: x += ".missing" if x not in qacats: @@ -1794,15 +1793,16 @@ else: logging.info("myupdates:", str(myupdates)) logging.info("myheaders:", str(myheaders)) - if commitmessagefile: + commitmessage = options.commitmsg + if options.commitmsgfile: try: - f = open(commitmessagefile) + f = open(options.commitmsgfile) commitmessage = f.read() f.close() del f except (IOError, OSError), e: if e.errno == errno.ENOENT: - portage.writemsg("!!! File Not Found: --commitmsgfile='%s'\n" % commitmessagefile) + portage.writemsg("!!! File Not Found: --commitmsgfile='%s'\n" % options.commitmsgfile) else: raise # We've read the content so the file is no longer needed. -- 2.26.2