Changeset 4234

Timestamp:

03/20/08 13:07:09 (5 years ago)

Author:

thomas

Message:

opkg: remove some printfs and replace with opkg_message where appropriate

Location:

trunk/src/target/opkg/libopkg

Files:

• opkg_configure.c (modified) (1 diff)
• opkg_download.c (modified) (1 diff)
• opkg_remove.c (modified) (3 diffs)

trunk/src/target/opkg/libopkg/opkg_configure.c

@@ -38 +38 @@
     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;
     }

trunk/src/target/opkg/libopkg/opkg_download.c

@@ -183 +183 @@
         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);

trunk/src/target/opkg/libopkg/opkg_remove.c

@@ -205 +205 @@
       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);
@@ -273 +275 @@
 
      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);
      }
@@ -350 +353 @@
                   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;