summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2009-07-24 14:02:56 +0300
committerTimo Teras <timo.teras@iki.fi>2009-07-24 14:02:56 +0300
commitc8c52e1dc6fbf99c013d16723a0b4c4087dc8439 (patch)
tree73e91f80765a014606bf8dec1249563921e6e4a6
parente5be34335ca8ff9df4ec53c2ab421522a6ca02c3 (diff)
downloadapk-tools-c8c52e1dc6fbf99c013d16723a0b4c4087dc8439.tar.gz
apk-tools-c8c52e1dc6fbf99c013d16723a0b4c4087dc8439.tar.bz2
apk-tools-c8c52e1dc6fbf99c013d16723a0b4c4087dc8439.tar.xz
apk-tools-c8c52e1dc6fbf99c013d16723a0b4c4087dc8439.zip
db: remove APK_NAME_VIRTUAL flag
use the package 'installed_size' == 0 as a test instead for dependency only packages.
-rw-r--r--src/add.c2
-rw-r--r--src/apk_database.h1
-rw-r--r--src/database.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/add.c b/src/add.c
index d147fa6..c916a2f 100644
--- a/src/add.c
+++ b/src/add.c
@@ -127,7 +127,7 @@ static int add_main(void *ctx, int argc, char **argv)
virtpkg->version = strdup("0");
virtpkg->description = strdup("virtual meta package");
apk_dep_from_pkg(&virtdep, &db, virtpkg);
- virtdep.name->flags |= APK_NAME_TOPLEVEL | APK_NAME_VIRTUAL;
+ virtdep.name->flags |= APK_NAME_TOPLEVEL;
virtpkg = apk_db_pkg_add(&db, virtpkg);
}
diff --git a/src/apk_database.h b/src/apk_database.h
index d2f27eb..35b0da1 100644
--- a/src/apk_database.h
+++ b/src/apk_database.h
@@ -62,7 +62,6 @@ struct apk_db_dir_instance {
};
#define APK_NAME_TOPLEVEL 0x0001
-#define APK_NAME_VIRTUAL 0x0002
struct apk_name {
apk_hash_node hash_node;
diff --git a/src/database.c b/src/database.c
index ce90aea..af18862 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1693,7 +1693,7 @@ int apk_db_install_pkg(struct apk_database *db,
}
/* Install the new stuff */
- if (!(newpkg->name->flags & APK_NAME_VIRTUAL)) {
+ if (newpkg->installed_size != 0) {
r = apk_db_unpack_pkg(db, newpkg, (oldpkg != NULL), cb, cb_ctx);
if (r != 0)
return r;