r4234 - trunk/src/target/opkg/libopkg

[thomas at sita.openmoko.org]

Author: thomas
Date: 2008-03-20 13:07:09 +0100 (Thu, 20 Mar 2008)
New Revision: 4234

Modified:
   trunk/src/target/opkg/libopkg/opkg_configure.c
   trunk/src/target/opkg/libopkg/opkg_download.c
   trunk/src/target/opkg/libopkg/opkg_remove.c
Log:
opkg: remove some printfs and replace with opkg_message where appropriate


Modified: trunk/src/target/opkg/libopkg/opkg_configure.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_configure.c	2008-03-20 10:43:09 UTC (rev 4233)
+++ trunk/src/target/opkg/libopkg/opkg_configure.c	2008-03-20 12:07:09 UTC (rev 4234)
@@ -37,7 +37,7 @@
 
     err = pkg_run_script(conf, pkg, "postinst", "configure");
     if (err) {
-	printf("ERROR: %s.postinst returned %d\n", pkg->name, err);
+	opkg_message(conf, OPKG_ERROR, "ERROR: %s.postinst returned %d\n", pkg->name, err);
 	return err;
     }
 

Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c	2008-03-20 10:43:09 UTC (rev 4233)
+++ trunk/src/target/opkg/libopkg/opkg_download.c	2008-03-20 12:07:09 UTC (rev 4234)
@@ -182,7 +182,9 @@
     else
 	return -1;
 
-    printf ("\n");
+    /* if no custom progress handler was set, we need to clear the default progress bar */
+    if (!opkg_cb_download_progress)
+        printf ("\n");
 
     err = file_move(tmp_file_location, dest_file_name);
 

Modified: trunk/src/target/opkg/libopkg/opkg_remove.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_remove.c	2008-03-20 10:43:09 UTC (rev 4233)
+++ trunk/src/target/opkg/libopkg/opkg_remove.c	2008-03-20 12:07:09 UTC (rev 4234)
@@ -204,11 +204,13 @@
       deps = pkg_has_installed_dependents(conf, NULL, p, &dependents);
       if (deps == 0)
       {
-	printf ("%s was autoinstalled but is now orphaned\n", buffer);
+	 opkg_message (conf, OPKG_INFO,
+	               "%s was autoinstalled but is now orphaned\n", buffer);
          opkg_remove_pkg(conf, p,0);
       }
 	else
-	   printf ("%s was autoinstalled and is still required by %d installed packages\n", buffer, deps);
+	   opkg_message (conf, OPKG_INFO, "%s was autoinstalled and is still required by "
+	                 "%d installed packages\n", buffer, deps);
     }
     free (buffer);
   }
@@ -272,7 +274,8 @@
      }
 
      if ( message==0 ){
-         printf("Removing package %s from %s...\n", pkg->name, pkg->dest->name);
+         opkg_message (conf, OPKG_NOTICE,
+	               "Removing package %s from %s...\n", pkg->name, pkg->dest->name);
          fflush(stdout);
      }
      pkg->state_flag |= SF_FILELIST_CHANGED;
@@ -349,7 +352,8 @@
 		  this seems like a better thing to do to conserve
 		  space. */
 	       if (conffile_has_been_modified(conf, conffile)) {
-		    printf("  not deleting modified conffile %s\n", file_name);
+		    opkg_message (conf, OPKG_NOTICE,
+		                  "  not deleting modified conffile %s\n", file_name);
 		    fflush(stdout);
 		    continue;
 	       }