r4210 - trunk/src/target/opkg/libopkg

thomas at sita.openmoko.org thomas at sita.openmoko.org
Fri Mar 14 16:54:30 CET 2008


Author: thomas
Date: 2008-03-14 16:54:29 +0100 (Fri, 14 Mar 2008)
New Revision: 4210

Modified:
   trunk/src/target/opkg/libopkg/opkg_cmd.c
   trunk/src/target/opkg/libopkg/opkg_download.c
   trunk/src/target/opkg/libopkg/opkg_download.h
Log:
opkg: use opkg_message rather than printf in opkg_verify_file()


Modified: trunk/src/target/opkg/libopkg/opkg_cmd.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_cmd.c	2008-03-14 15:10:46 UTC (rev 4209)
+++ trunk/src/target/opkg/libopkg/opkg_cmd.c	2008-03-14 15:54:29 UTC (rev 4210)
@@ -277,7 +277,7 @@
 		opkg_message (conf, OPKG_NOTICE, "Signature check failed\n");
 	  } else {
 	    int err;
-	    err = opkg_verify_file (list_file_name, tmp_file_name);
+	    err = opkg_verify_file (conf, list_file_name, tmp_file_name);
 	    if (err == 0)
 		opkg_message (conf, OPKG_NOTICE, "Signature check passed\n");
 	    else

Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c	2008-03-14 15:10:46 UTC (rev 4209)
+++ trunk/src/target/opkg/libopkg/opkg_download.c	2008-03-14 15:54:29 UTC (rev 4210)
@@ -293,7 +293,7 @@
 }
 
 int
-opkg_verify_file (char *text_file, char *sig_file)
+opkg_verify_file (opkg_conf_t *conf, char *text_file, char *sig_file)
 {
 #ifdef HAVE_GPGME
     int status = -1;
@@ -336,7 +336,7 @@
 
     return status;
 #else
-    printf ("Signature check skipped because GPG support was not enabled in this build\n");
+    opkg_message (conf, OPKG_NOTICE, "Signature check for %s was skipped because GPG support was not enabled in this build\n");
     return 0;
 #endif
 }

Modified: trunk/src/target/opkg/libopkg/opkg_download.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.h	2008-03-14 15:10:46 UTC (rev 4209)
+++ trunk/src/target/opkg/libopkg/opkg_download.h	2008-03-14 15:54:29 UTC (rev 4210)
@@ -27,5 +27,5 @@
  */
 int opkg_prepare_url_for_install(opkg_conf_t *conf, const char *url, char **namep);
 
-int opkg_verify_file (char *text_file, char *sig_file);
+int opkg_verify_file (opkg_conf_t *conf, char *text_file, char *sig_file);
 #endif





More information about the commitlog mailing list