aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-02-21 01:28:26 +0000
committerJason Woodward2005-02-21 01:28:26 +0000
commitf89ef7dc4392afaf50fd86233a8de54c0dabac3c (patch)
tree3424f5e06799771106ce3eff737a19657c6c4e63
parent7878287412b013acd8b7b86e6634425621e77df7 (diff)
downloadslapt-get-f89ef7dc4392afaf50fd86233a8de54c0dabac3c.tar.gz
add_deps_to_trans() returns early if passed pkg_info_t is NULL
-rw-r--r--ChangeLog1
-rw-r--r--example.slapt-getrc8
-rw-r--r--slack-required7
-rw-r--r--src/transaction.c1
4 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index aa52d0c..1b8587e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
0.9.9i Feb 20, 2005
+ * add_deps_to_trans() returns early if passed pkg_info_t is NULL
* configuration sources now dynamically created instead of static arrays
* --search return installed packages as well
* progress_cb for the progress callback is now part of rc_config structure (libslapt)
diff --git a/example.slapt-getrc b/example.slapt-getrc
index 9ea151e..d5a15a0 100644
--- a/example.slapt-getrc
+++ b/example.slapt-getrc
@@ -16,16 +16,16 @@ EXCLUDE=kernel-.*,alsa-.*,lilo,.*-[0-9]dl$,devs,aaa_elflibs
#SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-8.1/
#SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-9.0/
#SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-9.1/
-#SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-10.0/
-SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-10.1/
+SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-10.0/
+#SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-10.1/
#SOURCE=ftp://ftp.slackware.com/pub/slackware/slackware-current/
# slapt source
#SOURCE=http://software.jaos.org/slackpacks/8.1/
#SOURCE=http://software.jaos.org/slackpacks/9.0/
#SOURCE=http://software.jaos.org/slackpacks/9.1/
-#SOURCE=http://software.jaos.org/slackpacks/10.0/
-SOURCE=http://software.jaos.org/slackpacks/10.1/
+SOURCE=http://software.jaos.org/slackpacks/10.0/
+#SOURCE=http://software.jaos.org/slackpacks/10.1/
#SOURCE=http://software.jaos.org/slackpacks/current/
# you can use multiple sources, such as linuxpackages.net
diff --git a/slack-required b/slack-required
index 2d87df2..c696db0 100644
--- a/slack-required
+++ b/slack-required
@@ -1,8 +1,7 @@
-curl >= 7.12.2-i486-1
-glibc-solibs >= 2.3.4-i486-1
+curl >= 7.12.0-i486-1
+glibc-solibs >= 2.3.2-i486-6
binutils
-openssl >= 0.9.7e-i486-3
+openssl >= 0.9.7d-i486-1
pkgtools
zlib
-libidn
diff --git a/src/transaction.c b/src/transaction.c
index 4fc4cf0..b1a0d9f 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -563,6 +563,7 @@ int add_deps_to_trans(const rc_config *global_config, transaction_t *tran, struc
struct pkg_list *deps;
if( global_config->disable_dep_check == TRUE ) return 0;
+ if( pkg == NULL ) return 0;
deps = init_pkg_list();