From 9ef5bf6e2dc42eb5ba834455f8e5e3e8bc5fed7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Fri, 24 Feb 2012 09:20:18 +0200 Subject: [PATCH] pkg, db: use 's' for source repository tags instead of 'p' Will use 'p' for provides. --- src/database.c | 3 ++- src/package.c | 2 +- test/pinning.installed | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/database.c b/src/database.c index ca6c524..40f50aa 100644 --- a/src/database.c +++ b/src/database.c @@ -776,6 +776,7 @@ int apk_db_index_read(struct apk_database *db, struct apk_bstream *bs, int repo) ipkg->replaces_priority = apk_blob_pull_uint(&l, 10); break; case 'p': + case 's': ipkg->repository_tag = apk_db_get_tag_id(db, l); break; default: @@ -825,7 +826,7 @@ static int apk_db_write_fdb(struct apk_database *db, struct apk_ostream *os) apk_blob_push_blob(&bbuf, APK_BLOB_STR("\n")); } if (ipkg->repository_tag) { - apk_blob_push_blob(&bbuf, APK_BLOB_STR("p:")); + apk_blob_push_blob(&bbuf, APK_BLOB_STR("s:")); apk_blob_push_blob(&bbuf, *db->repo_tags[ipkg->repository_tag].name); apk_blob_push_blob(&bbuf, APK_BLOB_STR("\n")); } diff --git a/src/package.c b/src/package.c index cc5f6a5..74ce183 100644 --- a/src/package.c +++ b/src/package.c @@ -748,7 +748,7 @@ int apk_pkg_add_info(struct apk_database *db, struct apk_package *pkg, pkg->commit = apk_blob_cstr(value); break; case 'F': case 'M': case 'R': case 'Z': case 'r': case 'q': - case 'a': case 'p': + case 'a': case 'p': case 's': /* installed db entries which are handled in database.c */ return 1; default: diff --git a/test/pinning.installed b/test/pinning.installed index 8fb45e7..adfb113 100644 --- a/test/pinning.installed +++ b/test/pinning.installed @@ -4,7 +4,7 @@ V:3 S:1 I:1 D:b -p:testing +s:testing C:Q1hdUpqRv5mYgJEqW52UmVsv23ysE= P:b @@ -18,5 +18,5 @@ V:3 S:1 I:1 D:a>=3 -p:testing +s:testing