poldek: poldek/pm/rpm/rpminstall.c, poldek/pm/rpm/signature.c - co...

[mis]

Author: mis                          Date: Mon Jul  9 17:00:36 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- const poldek_VERBOSE

---- Files affected:
poldek/poldek/pm/rpm:
   rpminstall.c (1.24 -> 1.25) , signature.c (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: poldek/poldek/pm/rpm/rpminstall.c
diff -u poldek/poldek/pm/rpm/rpminstall.c:1.24 poldek/poldek/pm/rpm/rpminstall.c:1.25
--- poldek/poldek/pm/rpm/rpminstall.c:1.24	Sun Jul  8 18:42:28 2007
+++ poldek/poldek/pm/rpm/rpminstall.c	Mon Jul  9 19:00:31 2007
@@ -131,7 +131,7 @@
 int pm_rpm_execrpm(const char *cmd, char *const argv[], int ontty, int verbose_level)
 {
     struct p_open_st pst;
-    int n, ec;
+    int vsaved = -999, ec;
     unsigned p_open_flags = P_OPEN_KEEPSTDIN;
 
     
@@ -158,21 +158,19 @@
             return 0;
         }
     }
-    
-    n = 0;
-    if (poldek_VERBOSE == 0) {
-        poldek_VERBOSE = 1;
-        n = 1;
-    }
 
+    vsaved = -999;
+    if (poldek_VERBOSE == 0)
+        vsaved = poldek_set_verbose(1);
+    
     rpmr_process_output(&pst, verbose_level);
     if ((ec = p_close(&pst) != 0) && pst.errmsg != NULL)
         logn(LOGERR, "%s", pst.errmsg);
 
     p_st_destroy(&pst);
-    
-    if (n)
-        poldek_VERBOSE--;
+
+    if (vsaved != -999)
+        poldek_set_verbose(vsaved);
     
     return ec;
 }

================================================================
Index: poldek/poldek/pm/rpm/signature.c
diff -u poldek/poldek/pm/rpm/signature.c:1.3 poldek/poldek/pm/rpm/signature.c:1.4
--- poldek/poldek/pm/rpm/signature.c:1.3	Tue May 24 21:54:14 2005
+++ poldek/poldek/pm/rpm/signature.c	Mon Jul  9 19:00:31 2007
@@ -373,11 +373,14 @@
 extern int pm_rpm_verbose;
 int pm_rpm_verify_signature(void *pm_rpm, const char *path, unsigned flags) 
 {
-    int rv = pm_rpm_verbose, v = poldek_VERBOSE, rc;
-        
-    poldek_VERBOSE = pm_rpm_verbose = 1;
+    int v, rv = pm_rpm_verbose, rc;
+    
+    pm_rpm_verbose = 1;
+    v = poldek_set_verbose(pm_rpm_verbose);
+    
     rc = do_pm_rpm_verify_signature(pm_rpm, path, flags);
+    
     pm_rpm_verbose = rv;
-    poldek_VERBOSE = v;
+    poldek_set_verbose(v);
     return rc;
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/pm/rpm/rpminstall.c?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/poldek/poldek/pm/rpm/signature.c?r1=1.3&r2=1.4&f=u