[Morphix-cvs] SF.net SVN: morphix:[2646] trunk/mmaker/libmorphix/makemodule.c

[<pa...@us...>]

Revision: 2646
          http://morphix.svn.sourceforge.net/morphix/?rev=2646&view=rev
Author:   paul_c
Date:     2009-01-27 14:34:29 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
Call out savePackageList instead of rewriting the `dpkg -l` code...
Move deletePackages up so that the package & source lists reflect what is
installed after any <packagedel> tags have been accounted for.

dpkg is a core package and gets brutally killed off after we are done with it,
so the (minor) changes made will still work.

Modified Paths:
--------------
    trunk/mmaker/libmorphix/makemodule.c

Modified: trunk/mmaker/libmorphix/makemodule.c
===================================================================
--- trunk/mmaker/libmorphix/makemodule.c	2009-01-26 23:05:35 UTC (rev 2645)
+++ trunk/mmaker/libmorphix/makemodule.c	2009-01-27 14:34:29 UTC (rev 2646)
@@ -940,13 +940,15 @@
 		}
 	}
 
+	deletePackages(module,module->dirname);
+
+	// Save the package & source lists after removing queued packagedel tags.
 	savePackageList(module,module->dirname);
 
 	if (!getAptPackageSources(module, sources_location)) {
 		return FALSE;
 	}
 
-	deletePackages(module,module->dirname);
 	deleteCruft(module->dirname);
 
         if (!cleanApt(module,module->dirname)) {
@@ -1182,9 +1184,7 @@
 	fprintf(stderr,"Info: In getAptPackageSources\n");
 
 	// Store for future usage, do this regardless of any source being downloaded
-	cmdline = g_strdup_printf("%s %s sh -c \"COLUMNS=160 dpkg -l > /morphix/packages.gz\"",P_CHROOT,module->dirname);
-	ExecuteCommand(cmdline);
-	g_free(cmdline);
+	savePackagelist(module, module->dirname);
 
 	if (sources_location == NULL) { // no sources wanted
 		return TRUE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.