[Midnightbsd-cvs] src [7388] trunk/lib/libmport/bundle_read_install_pkg.c: exclude pre & post exec statements from the main plist loop

[laffer1 at midnightbsd.org]

Revision: 7388
          http://svnweb.midnightbsd.org/src/?rev=7388
Author:   laffer1
Date:     2015-12-01 05:49:51 -0500 (Tue, 01 Dec 2015)
Log Message:
-----------
exclude pre & post exec statements from the main plist loop

Modified Paths:
--------------
    trunk/lib/libmport/bundle_read_install_pkg.c

Modified: trunk/lib/libmport/bundle_read_install_pkg.c
===================================================================
--- trunk/lib/libmport/bundle_read_install_pkg.c	2015-12-01 10:13:06 UTC (rev 7387)
+++ trunk/lib/libmport/bundle_read_install_pkg.c	2015-12-01 10:49:51 UTC (rev 7388)
@@ -208,7 +208,7 @@
                     pkg->name) != MPORT_OK)
         goto ERROR;
 
-    if (mport_db_prepare(db, &assets, "SELECT type,data,checksum FROM stub.assets WHERE pkg=%Q", pkg->name) != MPORT_OK)
+    if (mport_db_prepare(db, &assets, "SELECT type,data,checksum FROM stub.assets WHERE pkg=%Q and type not in (%Q, %Q)", pkg->name, ASSET_PREEXEC, ASSET_POSTEXEC) != MPORT_OK)
         goto ERROR;
 
     (void) strlcpy(cwd, pkg->prefix, sizeof(cwd));
@@ -228,8 +228,8 @@
         }
 
         type     = (mportAssetListEntryType) sqlite3_column_int(assets, 0);
-        data     = sqlite3_column_text(assets, 1);
-        checksum = sqlite3_column_text(assets, 2);
+        data     = (char *) sqlite3_column_text(assets, 1);
+        checksum = (char *) sqlite3_column_text(assets, 2);
 
         switch (type) {
             case ASSET_CWD: