gir-rebuilder.py: various fixes

* Warn if files couldn't be assigned to packages
* Don't freak out if nothing was found
* Add more notifications for what all is being done
* Make colorizing a bit more readable
* Don't use the name 'file', use 'f' instead to avoid overwriting the basic type

1 files changed, 46 insertions, 20 deletions

diff --git a/scripts/gir-rebuilder.py b/scripts/gir-rebuilder.py
index 445b4213..7d4efd58 100755
--- a/scripts/gir-rebuilder.py
+++ b/scripts/gir-rebuilder.py
@@ -51,6 +51,16 @@ def get_contents(cpv):
     cpv = portage.catsplit(cpv)
     return set(portage.dblink(cpv[0], cpv[1], root, settings).getcontents().keys())
 
+def print_colorize(color, text):
+    print colorize(color, " * ") + text
+
+################
+## Parse Args ##
+################
+if '--help' in sys.argv:
+    usage()
+    exit(0)
+
 ##############
 ## Set vars ##
 ##############
@@ -59,6 +69,7 @@ if os.environ.has_key('ROOT'):
 portdb = portage.db[root]["vartree"].dbapi
 # Find the latest g-i
 # XXX: Assumes there's only one slot for g-i
+print_colorize("green", "Finding current GIRepository version...")
 gi = portdb.match(gi)[0]
 for each in get_contents(gi):
     # Find GIRepository-$ver.gir, and get the internal version
@@ -68,36 +79,51 @@ for each in get_contents(gi):
 else:
     raise Exception("GIRepository .gir not found")
 girversion = get_version(girepository)
+print_colorize("green", "Current GIRepository version is " + girversion)
 
 ##########
 ## Work ##
 ##########
-if '--help' in sys.argv:
-    usage()
-    exit(0)
-
+print_colorize("green", "Finding broken GIR files...")
 files_list = set()
 for dir in gir_dirs:
     # Walk the gir directories to find files
-    for path, dirs, files in os.walk(osp.join(root, dir)):
-        for file in files:
-            if not file.endswith('.gir'):
+    for (path, dirs, files) in os.walk(osp.join(root, dir)):
+        for f in files:
+            if not f.endswith('.gir'):
                 continue
             # Get the .gir version
-            version = get_version(osp.join(path, file))
-            # If not the same version as the GIRepository.gir, rebuild it
+            version = get_version(osp.join(path, f))
+            # If not the same version as GIRepository.gir, rebuild it
             if vercmp(girversion, version) != 0:
-                if not quiet:
-                    print colorize("yellow", "GIR file to be rebuilt: ")+osp.join(path, file)
-                files_list.add(osp.join(path, file))
+                print_colorize("yellow", "GIR file to be rebuilt: " + \
+                                         osp.join(path, f))
+                files_list.add(osp.join(path, f))
 
+# FIXME: Doesn't warn if it was unable to assign a file to a package
 rebuild_list = set()
-for cpv in portage.db[root]["vartree"].dbapi.cpv_all():
-    # If some of the files of this package are in the gir file list
-    if get_contents(cpv).intersection(files_list):
-        slot = portage.portdb.aux_get(cpv, ['SLOT'])[0]
-        # We strip the version, but maintain the slot (same as revdep-rebuild)
-        rebuild_list.add(portage.pkgsplit(cpv)[0]+':'+slot)
+if files_list:
+    print_colorize("green", "Assigning files to packages...")
+    files_assigned = set()
+    for cpv in portage.db[root]["vartree"].dbapi.cpv_all():
+        # If some of the files of this package are in the gir file list
+        files_owned = get_contents(cpv).intersection(files_list)
+        if files_owned:
+            files_assigned.add(files_owned)
+            slot = portage.portdb.aux_get(cpv, ['SLOT'])[0]
+            # We strip the version, but maintain the slot (same as revdep-rebuild)
+            rebuild_list.add(portage.pkgsplit(cpv)[0]+':'+slot)
+    files_unassigned = files_list.symmetric_difference(files_assigned)
+    if files_unassigned:
+        for file in files_unassigned:
+            print_colorize("yellow", "Unable to assign file to package: " + \
+                                     osp.join(path, file))
 
-# Run emerge
-subprocess.check_call("emerge -1 "+' '.join(sys.argv[1:]+list(rebuild_list)), shell=True)
+if files_list and rebuild_list:
+    print_colorize("green", "All done, starting rebuild...")
+    command = "emerge -1 " + '\n'.join(sys.argv[1:]+list(rebuild_list))
+    print command
+    # Run emerge
+    subprocess.check_call(command, shell=True)
+else:
+    print_colorize("green", "Everything seems to be in order, nothing to be rebuilt")