Changeset 4704 for current/host/trunk/langupdate/trunk

Timestamp:

08/07/08 21:40:18 (5 months ago)

Author:

codehelp

Message:

clean up the downloaded packages and the arch-specific lists too

Location:

current/host/trunk/langupdate/trunk

Files:

• debian/changelog (modified) (1 diff)
• src/aptcache.cc (modified) (2 diffs)
• src/langupdate.cc (modified) (5 diffs)

current/host/trunk/langupdate/trunk/debian/changelog

@@ -2 +2 @@
 
   * 0.0.5 Cleanup temporary files after each run
+  * clean up the downloaded packages and the arch-specific lists too
 
- -- Neil Williams <codehelp@debian.org>  Thu, 07 Aug 2008 17:53:58 -0300
+ -- Neil Williams <codehelp@debian.org>  Thu, 07 Aug 2008 18:38:22 -0300
 
 langupdate (0.0.4) unstable; urgency=low

current/host/trunk/langupdate/trunk/src/aptcache.cc

@@ -80 +80 @@
 //      gboolean All = _config->FindB("APT::Cache::AllNames","false");
 
-        path = g_strconcat ("/var/lib/langupdate/", suite_codename, "/lists/partial", NULL);
+        path = g_strconcat ("/var/lib/"PACKAGE"/", suite_codename, "/lists/partial", NULL);
         g_mkdir_with_parents (path, 0755);
         g_free (path);
-        path = g_strconcat ("/var/lib/langupdate/", suite_codename, "/archives/partial", NULL);
+        path = g_strconcat ("/var/lib/"PACKAGE"/", suite_codename, "/archives/partial", NULL);
         g_mkdir_with_parents (path, 0755);
         g_free (path);
-        fout = fopen ("/var/lib/langupdate/status", "a");
+        fout = fopen ("/var/lib/"PACKAGE"/status", "a");
         fclose (fout);
-        path = g_strconcat ("/var/lib/langupdate/", suite_codename, "/lists/lock", NULL);
+        path = g_strconcat ("/var/lib/"PACKAGE"/", suite_codename, "/lists/lock", NULL);
         fout = fopen (path, "a");
         fclose (fout);
@@ -103 +103 @@
         _config->Set("Apt::Architecture", HOST_CPU);
         _config->Set("help", true);
-        _config->Set("APT::Get::List-Cleanup", "off");
+        _config->Set("APT::Get::List-Cleanup", "on");
         _config->Set("Apt::Install-Recommends","false");
-        _config->Set("Dir",      "/var/lib/langupdate");
-        _config->Set("Dir::Etc", "/var/lib/langupdate");
-        _config->Set("Dir::Etc::SourceList", "/var/lib/langupdate/sources.list");
+        _config->Set("Dir",      "/var/lib/"PACKAGE);
+        _config->Set("Dir::Etc", "/var/lib/"PACKAGE);
+        _config->Set("Dir::Etc::SourceList", "/var/lib/"PACKAGE"/sources.list");
         _config->Set("Dir::State", suite_codename);
-        _config->Set("Dir::State::Status", "/var/lib/langupdate/status");
+        _config->Set("Dir::State::Status", "/var/lib/"PACKAGE"/status");
         _config->Set("Dir::Cache", suite_codename);
         if (_config->FindB("APT::Cache::Generate",true) == false)

current/host/trunk/langupdate/trunk/src/langupdate.cc

@@ -128 +128 @@
                 name = g_strdup_printf ( "%s %s %s %s", cmd, config_str, func, (gchar*)value);
         g_spawn_command_line_sync (name, &hdl, &hdl_err, &err_status, &gerr);
+        g_free (name);
         if (gerr) 
         {
@@ -134 +135 @@
                 fprintf (stdout, _("status code:%d\n"), err_status);
                 fprintf (stdout, "%s\n", gerr->message);
+                g_clear_error (&gerr);
+                g_free (hdl_err);
                 return;
         }
         if (dry_run)
+        {
                 fprintf (stdout, "%s\n", hdl);
+                g_free (hdl);
+        }
+        g_free (cmd);
+        g_free (func);
 }
 
@@ -255 +263 @@
         g_unlink (path);
         g_free (path);
+}
+
+static void
+run_apt_clean (const gchar * user_suite)
+{
+        gchar * config_str, * hdl, * hdl_err, * name;
+        GError * gerr = NULL;
+        gint err_status = 0;
+
+        config_str = lu_get_aptstring();
+        name = g_strdup_printf ( "%s %s %s", "apt-get", config_str, "clean");
+        g_spawn_command_line_sync (name, &hdl, &hdl_err, &err_status, &gerr);
+        if (gerr) 
+        {
+                /// \todo rationalise error output.
+                fprintf (stdout, _("apt returned an error:%s\n"), hdl_err);
+                fprintf (stdout, _("status code:%d\n"), err_status);
+                fprintf (stdout, "%s\n", gerr->message);
+                g_clear_error (&gerr);
+                g_free (hdl_err);
+                return;
+        }
+}
+
+static void
+remove_binlists (gpointer value, gpointer data)
+{
+        gchar * code, * path, *suite;
+        suite = (gchar*) data;
+        code = (gchar*) value;
+        if ((code) && (strcmp (code, "")))
+        {
+                path = g_strconcat ("/var/lib/",PACKAGE,"/", suite, 
+                        "/lists/buildd.emdebian.org_locale_dists_", suite, "_",
+                        code, "_binary-",HOST_CPU,"_Packages", NULL);
+                g_unlink (path);
+                g_free (path);
+        }
 }
 
@@ -368 +414 @@
         g_list_foreach (choices, output, NULL);
         g_hash_table_destroy (tbl);
-        g_list_free (locales);
         g_list_free (choices);
+        run_apt_clean (suite_codename);
         remove_cache ("lists/lock", suite_codename);
         remove_cache ("lock", suite_codename);
@@ -375 +421 @@
         remove_cache ("pkgcache.bin", suite_codename);
         remove_lists (suite_codename);
+        g_list_foreach (locales, remove_binlists, suite_codename);
+        g_list_free (locales);
         g_unlink (sourceslist);
         return 0;