summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2011-10-05 20:36:07 +0000
committerJason Woodward2011-10-05 20:36:07 +0000
commit8be2b51c0fe8e0e9d4fbd48fd8076556acd7be84 (patch)
tree98b5a3a4d0cc223645d11b8a73367bb572e3bc41
parent0552ba18294fe45fe383746c52b3415de46f73c0 (diff)
downloadslapt-src-8be2b51c0fe8e0e9d4fbd48fd8076556acd7be84.tar.gz
--build name:version no longer auto installs0.3.2b
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--src/main.c10
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 975414f..8bf04d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
-0.3.2a Au 02, 2011
+0.3.2b Oct 05, 2011
+ * --build name:version no longer auto installs
+
+0.3.2a Aug 02, 2011
* --show now recognizes the name:version notation
* updated --help output (thanks Igor)
diff --git a/configure.ac b/configure.ac
index 33edb68..76b04d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([slapt-src], [0.3.2a], [slapt-get-devel@software.jaos.org])
+AC_INIT([slapt-src], [0.3.2b], [slapt-get-devel@software.jaos.org])
AM_INIT_AUTOMAKE([-Wall foreign])
AC_CONFIG_SRCDIR([src/])
AC_CONFIG_HEADERS([config.h])
diff --git a/src/main.c b/src/main.c
index aa7e0b1..b3d2371 100644
--- a/src/main.c
+++ b/src/main.c
@@ -253,14 +253,22 @@ int main (int argc, char *argv[])
case BUILD_OPT:
for (i = 0; i < sbs->count; i++) {
slapt_src_slackbuild *sb = sbs->slackbuilds[i];
+ int r = 0, nv_len = strlen (sb->name) + strlen (sb->version) + 2;
+ char *namever = slapt_malloc (sizeof *namever * nv_len);
+ r = snprintf (namever, nv_len, "%s:%s", sb->name, sb->version);
+
+ if (r+1 != nv_len)
+ exit (EXIT_FAILURE);
slapt_src_fetch_slackbuild (config, sb);
slapt_src_build_slackbuild (config, sb);
/* XXX we assume if we didn't request the slackbuild, then
it is a dependency, and needs to be installed */
- if (slapt_search_list (names, sb->name) == NULL)
+ if (slapt_search_list (names, sb->name) == NULL && slapt_search_list (names, namever) == NULL)
slapt_src_install_slackbuild (config, sbs->slackbuilds[i]);
+
+ free (namever);
}
break;