Add erasure callback support to rpmShowProgress() and enable on rpmErase()

- Just use the same bits as install does, they behave the same for
  our purposes. On upgrades the output would get confusing especially
  with --hash when package versions aren't output'ed, so we print
  out extra output when entering install and erase stages. Only
  do this when --hash is used (ie a human is probably watching us)
  to hopefully avoid breaking scripts (including our test-suite) that
  rely on the ages old behavior of non-hashed output.

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 019d11a..f7c7fc8 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -103,6 +103,7 @@ void * rpmShowProgress(const void * arg,
     void * rc = NULL;
     const char * filename = (const char *)key;
     static FD_t fd = NULL;
+    static int state = -1;
 
     switch (what) {
     case RPMCALLBACK_INST_OPEN_FILE:
@@ -132,6 +133,19 @@ void * rpmShowProgress(const void * arg,
        break;
 
     case RPMCALLBACK_INST_START:
+    case RPMCALLBACK_UNINST_START:
+       if (state != what) {
+           state = what;
+           if (flags & INSTALL_HASH) {
+               if (what == RPMCALLBACK_INST_START) {
+                   fprintf(stdout, "Updating / installing...\n");
+               } else {
+                   fprintf(stdout, "Cleaning up / removing...\n");
+               }
+               fflush(stdout);
+           }
+       }
+               
        rpmcliHashesCurrent = 0;
        if (h == NULL || !(flags & INSTALL_LABEL))
            break;
@@ -157,6 +171,7 @@ void * rpmShowProgress(const void * arg,
 
     case RPMCALLBACK_TRANS_PROGRESS:
     case RPMCALLBACK_INST_PROGRESS:
+    case RPMCALLBACK_UNINST_PROGRESS:
        if (flags & INSTALL_PERCENT)
            fprintf(stdout, "%%%% %f\n", (double) (total
                                ? ((((float) amount) / total) * 100)
@@ -171,12 +186,13 @@ void * rpmShowProgress(const void * arg,
        rpmcliProgressTotal = 1;
        rpmcliProgressCurrent = 0;
        rpmcliPackagesTotal = total;
+       state = what;
        if (!(flags & INSTALL_LABEL))
            break;
        if (flags & INSTALL_HASH)
            fprintf(stdout, "%-28s", _("Preparing..."));
        else
-           fprintf(stdout, "%s\n", _("Preparing packages for installation..."));
+           fprintf(stdout, "%s\n", _("Preparing packages..."));
        (void) fflush(stdout);
        break;
 
@@ -187,10 +203,6 @@ void * rpmShowProgress(const void * arg,
        rpmcliProgressCurrent = 0;
        break;
 
-    case RPMCALLBACK_UNINST_PROGRESS:
-       break;
-    case RPMCALLBACK_UNINST_START:
-       break;
     case RPMCALLBACK_UNINST_STOP:
        break;
     case RPMCALLBACK_UNPACK_ERROR:
@@ -631,9 +643,7 @@ int rpmErase(rpmts ts, struct rpmInstallArguments_s * ia, ARGV_const_t argv)
 
     (void) rpmtsSetFlags(ts, ia->transFlags);
 
-#ifdef NOTYET  /* XXX no callbacks on erase yet */
     setNotifyFlag(ia, ts);
-#endif
 
     qfmt = rpmExpand("%{?_query_all_fmt}\n", NULL);
     for (arg = argv; *arg; arg++) {