Clean-Up script implemented, small refactoring

scripts/tatt

@@ -149,23 +149,23 @@ if not packs==None:
     if isroot:
         # If we are root, then we can write to package.keywords
         try:
-            keywordfile=open("/etc/portage/package.keywords/arch", 'r+')
+            unmaskfile=open(config['unmaskfile'], 'r+')
         except IOError:
             # create an empty file, this should be beautified
-            keywordfile=open("/etc/portage/package.keywords/arch", 'w')
-            keywordfile.write(" ")
-            keywordfile.close()
-            keywordfile=open("/etc/portage/package.keywords/arch", 'r+')
+            unmaskfile=open(config['unmaskfile'], 'w')
+            unmaskfile.write(" ")
+            unmaskfile.close()
+            unmaskfile=open(config['unmaskfile'], 'r+')
 
-        keywordfilecontent = keywordfile.read()
+        unmaskfileContent = unmaskfile.read()
         for p in packs:
-            # Test if keywordfile already contains the atom
-            if re.search(p.packageString(), keywordfilecontent):
+            # Test if unmaskfile already contains the atom
+            if re.search(p.packageString(), unmaskfileContent):
                 print (p.packageString() + " already in package.keywords.")
             else:
-                keywordfile.write("\n" + p.packageString() + "\n")
+                unmaskfile.write("\n" + p.packageString() + "\n")
                 print ("Appended " + p.packageString()+ " to /etc/portage/package.keywords/arch")
-        keywordfile.close()
+        unmaskfile.close()
     else:
         print ("You are not root, your unmaskstring would be:")
         print ("\n".join([p.packageString() for p in packs]) + "\n")

tatt/bugbrowser.py

@@ -342,3 +342,4 @@ def launch_browser (config):
 		scripts.writeusecombiscript(jobname, packages, config)
 		scripts.writerdepscript (jobname, packages, config)
 		scripts.writecommitscript (jobname, str(b.id_number()), packages, config)
+		scripts.writeCleanUpScript (jobname, config)

tatt/scriptwriter.py

@@ -147,3 +147,23 @@ def writecommitscript (job, bugnum, packlist, config):
     outfile.write (commitfooterfile.read().replace("@@ARCH@@", config['arch']).replace("@@BUG@@", bugnum))
     outfile.close()
     print(("Commit script written to " + outfilename))
+
+
+######## Write clean-up script ##############
+def writeCleanUpScript (job, config):
+    try:
+        cleanUpTemplate=open(config['template-dir'] + "cleanup", 'r')
+    except IOError:
+        print("Clean-Up template not found in" + config['template-dir'])
+        exit(1)
+    script = cleanUpTemplate.read().replace("@@JOB@@", job)
+    script = script.replace("@@CPV@@", job)
+    script = script.replace("@@KEYWORDFILE@@", config['unmaskfile'])
+    outfilename = (job + "-cleanup.sh")
+    if os.path.isfile(outfilename):
+        print(("WARNING: Will overwrite " + outfilename))
+    outfile = open(outfilename,'w')
+    outfile.write(script)
+
+
+

templates/cleanup

@@ -0,0 +1,6 @@
+#!/bin/sh
+## Clean-up the keywordfile 
+sed -i "/@@CPV@@/d" @@KEYWORDFILE@@
+
+# Remove all files associated to the job:
+rm -f @@JOB@@-*