diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-01-23 19:43:32 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-01-23 19:43:32 +0000 |
| commit | fbac4831ed124fe7936322142993a20044847e8c (patch) | |
| tree | 144f0c102b725a61f07d66864804be51cd07a9e3 | |
| parent | 7dbd3fb0b83179f16cbec36fad340f450c1e0a79 (diff) | |
| download | simplepkg-fbac4831ed124fe7936322142993a20044847e8c.tar.gz simplepkg-fbac4831ed124fe7936322142993a20044847e8c.tar.bz2 | |
small fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@119 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | lib/common.sh | 1 | ||||
| -rwxr-xr-x | src/simplaret | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/common.sh b/lib/common.sh index 4953041..2065739 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -120,7 +120,6 @@ function install_packages { SILENT=1 ARCH=$ARCH VERSION=$VERSION $SIMPLARET --purge fi else - echo error: could not install package $pack unable_to_install="$unable_to_install\n\t$pack" fi diff --git a/src/simplaret b/src/simplaret index b8879eb..d4ccdb2 100755 --- a/src/simplaret +++ b/src/simplaret @@ -691,15 +691,15 @@ function simplaret_install { package="`simplaret_get $1 --silent`" - if [ "$?" == "0" ]; then + if [ "$?" == "0" ] && [ ! -z "$package" ]; then if [ -f "$package" ]; then ROOT=$root upgradepkg --install-new $package else - echo "error: could not install package $package: file not found" + echo "error: could not install package $1: file not found" return 1 fi else - echo "error: could not install package $package" + echo "error: could not install package $1" return 1 fi |