Fix: Make repoman actually USE -m commit message again (and -M

commit message file). (branches/prefix r8280)

svn path=/main/trunk/; revision=8295

diff --git a/bin/repoman b/bin/repoman
index 82025f6f8f89972284687715a19854d4ab2186bd..c9e9138a2fbac09aa986ea114fb5b56d81b44b42 100755 (executable)
--- 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:
@@ -1694,15 +1693,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.