diff options
| author | Timo Teras <timo.teras@iki.fi> | 2009-07-22 20:47:21 +0300 |
|---|---|---|
| committer | Timo Teras <timo.teras@iki.fi> | 2009-07-22 20:47:21 +0300 |
| commit | 718ef3079ea18fcb588264d26e3316628ad18ba0 (patch) | |
| tree | 7a945f9ad7510096854bb2f599271b7a73aafa95 /src/package.c | |
| parent | 9b77c053e8fd03348ed04ba09ceaaf7ba99ca6f6 (diff) | |
| download | apk-tools-718ef3079ea18fcb588264d26e3316628ad18ba0.tar.bz2 apk-tools-718ef3079ea18fcb588264d26e3316628ad18ba0.tar.xz | |
add: fixes to installing non-repository package
make sure cache is enabled on non-permanent rootfs setups.
some optimizations and fixes too.
Diffstat (limited to 'src/package.c')
| -rw-r--r-- | src/package.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/package.c b/src/package.c index 4f6262e..0ef1d59 100644 --- a/src/package.c +++ b/src/package.c @@ -181,7 +181,7 @@ void apk_dep_from_pkg(struct apk_dependency *dep, struct apk_database *db, struct apk_package *pkg) { *dep = (struct apk_dependency) { - .name = apk_db_get_name(db, APK_BLOB_STR(pkg->name->name)), + .name = pkg->name, .version = pkg->version, .result_mask = APK_VERSION_EQUAL, }; @@ -735,7 +735,7 @@ int apk_pkg_read(struct apk_database *db, const char *file, ctx.pkg = apk_db_pkg_add(db, ctx.pkg); if (pkg != NULL) *pkg = ctx.pkg; - r = 0; + return 0; err: apk_pkg_free(ctx.pkg); return r; |