Ticket #142: pmerge.py.patch

pmerge.py

@@ -231 +231 @@
             raise Failure('vdb is frozen')
 
     for idx, match in enumerate(matches):
-        out.write("removing %i of %i: %s" % (idx + 1, len(matches), match))
+        out.write(out.bold, out.fg('yellow'), ">> removing %i of %i: %s" % (idx + 1, len(matches), match))
         out.title("%i/%i: %s" % (idx + 1, len(matches), match))
         op = vdb.uninstall(match, observer=repo_obs)
         ret = op.finish()
@@ -240 +240 @@
                 raise Failure('failed unmerging %s' % (match,))
             out.write(out.fg('red'), 'failed unmerging ', match)
         update_worldset(world_set, match, remove=True)
-    out.write("finished; removed %i packages" % len(matches))
+    out.write(out.bold, out.fg('yellow'), ' * ', out.reset, "Finished; removed %i packages" % len(matches))
 
 
 def get_pkgset(config, err, setname):
@@ -429 +429 @@
 
     failures = []
     resolve_time = time()
-    out.write(out.bold, ' * ', out.reset, 'Resolving...')
+    out.write(out.bold, out.fg('yellow'), ' * ', out.reset, out.bold, 'Resolving...')
     out.title('Resolving...')
     for restrict in atoms:
         ret = resolver_inst.add_atom(restrict)
@@ -509 +509 @@
 
     change_count = len(changes)
     for count, op in enumerate(changes):
-        out.write("Processing %i of %i: %s" % (count + 1, change_count,
+        out.write(out.bold, out.fg('blue'), ">> Processing %i of %i: %s" % (count + 1, change_count,
             op.pkg.cpvstr))
         out.title("%i/%i: %s" % (count + 1, change_count, op.pkg.cpvstr))
         if op.desc != "remove":
@@ -583 +583 @@
                     out.write('>>> Adding %s to world file' % op.pkg.cpvstr)
                     add_pkg = slotatom_if_slotted(all_repos, op.pkg.versioned_atom)
                     update_worldset(world_set, add_pkg)
-    out.write("finished")
+    out.write(out.bold, out.fg('blue'), ' * ', out.reset, "Finished")
     return 0