Send commitlog mailing list submissions to
        commitlog@lists.openmoko.org

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. r4190 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
   2. r4191 -
      trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src
      ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2008-03-10 17:33:00 +0100 (Mon, 10 Mar 2008)
New Revision: 4190

Modified:
   trunk/src/target/opkg/libopkg/opkg_cmd.c
Log:
opkg: use a single temporary directory for entire update transaction and remove
it when done.


Modified: trunk/src/target/opkg/libopkg/opkg_cmd.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_cmd.c    2008-03-10 05:47:55 UTC (rev 
4189)
+++ trunk/src/target/opkg/libopkg/opkg_cmd.c    2008-03-10 16:33:00 UTC (rev 
4190)
@@ -184,6 +184,7 @@
 
 static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
+     char *tmp;
      int err;
      int failures;
      char *lists_dir;
@@ -212,6 +213,16 @@
      } 
 
      failures = 0;
+
+
+     tmp = strdup ("/tmp/opkg.XXXXXX");
+
+     if (mkdtemp (tmp) == NULL) {
+        perror ("mkdtemp");
+        failures++;
+     }
+
+
      for (iter = conf->pkg_src_list.head; iter; iter = iter->next) {
          char *url, *list_file_name;
 
@@ -225,17 +236,8 @@
 
          sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
          if (src->gzip) {
-             char *tmp;
              char *tmp_file_name;
              FILE *in, *out;
-
-             tmp = strdup ("/tmp/opkg.XXXXXX");
-
-             if (mkdtemp (tmp) == NULL) {
-                 perror ("mkdtemp");
-                 failures++;
-                 continue;
-             }
              
              sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
              err = opkg_download(conf, url, tmp_file_name);
@@ -252,8 +254,6 @@
                   if (out)
                        fclose (out);
                   unlink (tmp_file_name);
-                  rmdir (tmp);
-                  free (tmp);
              }
          } else
              err = opkg_download(conf, url, list_file_name);
@@ -274,14 +274,9 @@
          else
              sprintf_alloc(&url, "%s/%s", src->value, "Packages.sig");
 
-         /* create temporary dir for it */
-         char *tmp, *tmp_file_name;
-         tmp = strdup ("/tmp/opkg.XXXXXX");
-         if (mkdtemp (tmp) == NULL) {
-               perror ("mkdtemp");
-               failures++;
-               continue;
-         }
+         /* create temporary file for it */
+         char *tmp_file_name;
+
          sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
 
          err = opkg_download(conf, url, tmp_file_name);
@@ -297,12 +292,13 @@
                opkg_message (conf, OPKG_NOTICE, "Signature check failed\n");
          }
          unlink (tmp_file_name);
-         unlink (tmp);
          free (tmp_file_name);
 
          free (url);
          free(list_file_name);
      }
+     rmdir (tmp);
+     free (tmp);
      free(lists_dir);
 
 #ifdef CONFIG_CLEAR_SW_INSTALL_FLAG




--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-03-11 08:39:12 +0100 (Tue, 11 Mar 2008)
New Revision: 4191

Modified:
   
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
Log:
openmoko-panel-gsm: disable CIPHER event notice for bug#1248 (Erin Yueh)


Modified: 
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
===================================================================
--- 
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
        2008-03-10 16:33:00 UTC (rev 4190)
+++ 
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
        2008-03-11 07:39:12 UTC (rev 4191)
@@ -128,7 +128,7 @@
 static void gsm_applet_update_cipher_status(MokoGsmdConnection* self, int 
status)
 {
     g_debug( "gsm_applet_update_cipher_status: status = %d", status );
-    gsm_applet_show_status( 0, theApplet );
+    /* bug#1248 gsm_applet_show_status( 0, theApplet ); */
 }
 
 static void gsm_applet_network_current_operator_cb(MokoGsmdConnection *self, 
const gchar* name)




--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to