From 718ef3079ea18fcb588264d26e3316628ad18ba0 Mon Sep 17 00:00:00 2001
From: Timo Teras <timo.teras@iki.fi>
Date: Wed, 22 Jul 2009 20:47:21 +0300
Subject: add: fixes to installing non-repository package

make sure cache is enabled on non-permanent rootfs setups.
some optimizations and fixes too.
---
 src/package.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/package.c')

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;
-- 
cgit v1.2.3