summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2008-02-29 21:52:57 +0100
committerDan McGee <dan@archlinux.org>2008-03-06 19:05:14 -0600
commit54af52f87d6d9547629bb336c365943ff9bb4876 (patch)
tree514595bd81a91fc6767f2b4b397407bbea094eea
parent7c3f6feb41ef5ea99b1d0c94771210bf77d90c6d (diff)
New alpm_version function
Now pacman frontend uses this function instead of the compile-time libalpm version number. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> [Dan: fix one more spot where LIB_VERSION was used] Signed-off-by: Dan McGee <dan@archlinux.org> (cherry picked from commit 49197b7492d61bf1fc6bef59a708f4f586f32edb)
-rw-r--r--lib/libalpm/alpm.c5
-rw-r--r--lib/libalpm/alpm.h1
-rw-r--r--src/pacman/pacman.c6
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 473993a0..fb19d076 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -81,4 +81,9 @@ int SYMEXPORT alpm_release(void)
* @brief Various libalpm functions
*/
+/* Get the version of library */
+const char SYMEXPORT *alpm_version(void) {
+ return(LIB_VERSION);
+}
+
/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 4797fcfa..96b63ca6 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -60,6 +60,7 @@ typedef struct __pmgraph_t pmgraph_t;
int alpm_initialize(void);
int alpm_release(void);
+const char *alpm_version(void);
/*
* Logging facilities
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 377ea3fe..d6997689 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -150,7 +150,7 @@ static void usage(int op, const char * const myname)
static void version(void)
{
printf("\n");
- printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, LIB_VERSION);
+ printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
printf("/ _.-' .-. .-. .-. Copyright (C) 2002-2008 Judd Vinet <jvinet@zeroflux.org>\n");
printf("\\ '-. '-' '-' '-'\n");
printf(" '--'\n");
@@ -183,8 +183,8 @@ static void setuseragent(void)
struct utsname un;
uname(&un);
- snprintf(agent, 100, "pacman/" PACKAGE_VERSION " (%s %s) libalpm/" LIB_VERSION,
- un.sysname, un.machine);
+ snprintf(agent, 100, "pacman/%s (%s %s) libalpm/%s",
+ PACKAGE_VERSION, un.sysname, un.machine, alpm_version());
setenv("HTTP_USER_AGENT", agent, 0);
}