aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2011-03-29 14:51:57 +0300
committerTimo Teräs <timo.teras@iki.fi>2011-03-29 14:51:57 +0300
commit9eeb95470b49529998d0518e3a89638400dca858 (patch)
tree2850d4d65956c41a3e315fee032b63452a7790c1
parente783f20eff95a22452856eb3e33720d2d8c23a09 (diff)
downloadaports-9eeb95470b49529998d0518e3a89638400dca858.tar.gz
aports-9eeb95470b49529998d0518e3a89638400dca858.tar.bz2
aports-9eeb95470b49529998d0518e3a89638400dca858.tar.xz
apk-tools-2.1.0_pre1v2.1.0_pre1
-rw-r--r--Makefile2
-rw-r--r--src/fetch.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7499414b0b..e70c8bf14f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
-include config.mk
PACKAGE := apk-tools
-VERSION := 2.0.7
+VERSION := 2.1.0_pre1
##
# Default directories
diff --git a/src/fetch.c b/src/fetch.c
index 0f39ecd2c7..09e3b9d3ec 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -109,12 +109,11 @@ static int fetch_package(struct fetch_ctx *fctx,
return 0;
}
- apk_message("Downloading %s-" BLOB_FMT, pkg->name->name,
- BLOB_PRINTF(*pkg->version));
+ apk_message("Downloading " PKG_VER_FMT, PKG_VER_PRINTF(pkg));
repo = apk_db_select_repo(db, pkg);
if (repo == NULL) {
- apk_error("%s-" BLOB_FMT ": package is not currently available",
- pkg->name->name, BLOB_PRINTF(*pkg->version));
+ apk_error(PKG_VER_FMT ": package is not currently available",
+ PKG_VER_PRINTF(pkg));
return -1;
}