opkg: use opkg_message rather than printf in opkg_verify_file()

git-svn-id: http://opkg.googlecode.com/svn/trunk@56 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index 463b15d49f5081117c622ea57fad35e70bd4175a..5aa5dfa3f4c6e043a7f228363eab55ba8e0cfb6f 100644 (file)
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -277,7 +277,7 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
                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

diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c
index 25d177aad3691dbbf1615d646a6376e1295fa348..4160b97ffeb34c95535110dd5776d91d6fc6b931 100644 (file)
--- a/libopkg/opkg_download.c
+++ b/libopkg/opkg_download.c
@@ -293,7 +293,7 @@ int opkg_prepare_url_for_install(opkg_conf_t *conf, const char *url, char **name
 }
 
 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 @@ opkg_verify_file (char *text_file, char *sig_file)
 
     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
 }

diff --git a/libopkg/opkg_download.h b/libopkg/opkg_download.h
index d3f419db8f08492b827912c7ead436df8f3cc01f..da65b0032903950063708423e66edf5b063f3749 100644 (file)
--- a/libopkg/opkg_download.h
+++ b/libopkg/opkg_download.h
@@ -27,5 +27,5 @@ int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir);
  */
 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