diff options
author | Timo Teräs <timo.teras@iki.fi> | 2012-01-06 13:42:27 +0200 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2012-01-06 13:42:27 +0200 |
commit | 1de86529a9a35e3dbd2927e54254ad39c4aacd95 (patch) | |
tree | 3459520f07b77f6df8c69f9bafe3c1b10916c9b6 | |
parent | 23c39085ce3b2ac80b4c643d1a0855cfdcd91c35 (diff) | |
download | apk-tools-1de86529a9a35e3dbd2927e54254ad39c4aacd95.tar.gz apk-tools-1de86529a9a35e3dbd2927e54254ad39c4aacd95.tar.bz2 apk-tools-1de86529a9a35e3dbd2927e54254ad39c4aacd95.tar.xz apk-tools-1de86529a9a35e3dbd2927e54254ad39c4aacd95.zip |
pkg: fix writing of deps with tag and version specifier
It is really name(@tag)(>=version).
-rw-r--r-- | src/package.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/package.c b/src/package.c index 0283c25..97a45c6 100644 --- a/src/package.c +++ b/src/package.c @@ -342,14 +342,14 @@ void apk_blob_push_dep(apk_blob_t *to, struct apk_database *db, struct apk_depen } apk_blob_push_blob(to, APK_BLOB_STR(dep->name->name)); - if (!APK_BLOB_IS_NULL(*dep->version)) { - apk_blob_push_blob(to, APK_BLOB_STR(apk_version_op_string(dep->result_mask))); - apk_blob_push_blob(to, *dep->version); - } if (dep->repository_tag && db != NULL) { apk_blob_push_blob(to, APK_BLOB_PTR_LEN("@", 1)); apk_blob_push_blob(to, *db->repo_tags[dep->repository_tag].name); } + if (!APK_BLOB_IS_NULL(*dep->version)) { + apk_blob_push_blob(to, APK_BLOB_STR(apk_version_op_string(dep->result_mask))); + apk_blob_push_blob(to, *dep->version); + } } void apk_blob_push_deps(apk_blob_t *to, struct apk_database *db, struct apk_dependency_array *deps) |