spk diff spk-add @ rev 70
small clean
author | Christian Mesh <meshca@clarkson.edu> |
---|---|
date | Sat May 19 04:59:02 2012 -0500 (2012-05-19) |
parents | 0cb21eb5cf20 |
children | f6b0c7cd8d16 |
line diff
1.1 --- a/spk-add Sat May 19 03:51:05 2012 -0500 1.2 +++ b/spk-add Sat May 19 04:59:02 2012 -0500 1.3 @@ -34,7 +34,9 @@ 1.4 } 1.5 1.6 # Log install messages 1.7 +# Parameters: package 1.8 log_install() { 1.9 + local pkg=$1 1.10 debug "log_install: $logdir/$pkg/install.log" 1.11 mkdir -p $logdir/$pkg 1.12 tee $logdir/$pkg/install.log 1.13 @@ -85,12 +87,8 @@ 1.14 gettext "Install missing dependencies" 1.15 if ! confirm; then 1.16 gettext "WARNING: Any dependencies installed"; newline 1.17 - else 1.18 - install_deps $package_name $DEPENDS 1.19 fi 1.20 - else 1.21 install_deps $package_name $DEPENDS 1.22 - fi 1.23 else 1.24 newline 1.25 fi 1.26 @@ -367,7 +365,7 @@ 1.27 case "$pkg" in 1.28 *.tazpkg|*.spk) 1.29 count=$(($count + 1)) 1.30 - install_local $pkg | log_install ;; 1.31 + install_local $pkg | log_install $pkg;; 1.32 *.deb|.rmp) 1.33 echo "TODO: spk-convert then install" ;; 1.34 *.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;; 1.35 @@ -375,7 +373,7 @@ 1.36 *) 1.37 [ "$forced" ] || check_installed $pkg 1.38 count=$(($count + 1)) 1.39 - install_web $pkg | log_install ;; 1.40 + install_web $pkg | log_install $pkg;; 1.41 esac 1.42 done 1.43