projects/aports·commit 9eeb9547

apk-tools-2.1.0_pre1

9eeb9547 · Timo Teräs <[email protected]> · 2011-03-29 14:51:57 +03:00

Commit
9eeb95470b49529998d0518e3a89638400dca858
Parents
e783f20e

Changes

2 files changed · +4 −5

FileStatusAddDelContent
Makefilemodified+1−1View file
src/fetch.cmodified+3−4View file

Makefile

View file
diff --git a/Makefile b/Makefile
index 7499414..e70c8bf 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

src/fetch.c

View file
diff --git a/src/fetch.c b/src/fetch.c
index 0f39ecd..09e3b9d 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;
}