diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-10 15:54:23 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-10 15:54:23 +0000 |
| commit | ee362e585b5b696f455a4c642744cb588429eb9b (patch) | |
| tree | ed4e32b7e33f7865b5e71bdc147b1e648834636c /trunk | |
| parent | 494f01cda212b1359aac656cbaaaeb9f99345b9a (diff) | |
| download | simplepkg-ee362e585b5b696f455a4c642744cb588429eb9b.tar.gz simplepkg-ee362e585b5b696f455a4c642744cb588429eb9b.tar.bz2 | |
small bugfix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@333 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/doc/CHANGELOG | 12 | ||||
| -rw-r--r-- | trunk/lib/common.sh | 3 | ||||
| -rwxr-xr-x | trunk/src/simplaret | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index f851847..64e61b4 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -1,6 +1,18 @@ simplepkg changelog =================== +0.5pre15 +======== + + - simplaret: + - small bugfix + + - common.sh: + - small bugfix + + - mkbuild: + - some changes + 0.5pre14 ======== diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index f331e56..5c53a09 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -122,7 +122,8 @@ function install_packages { ROOT=/$root ARCH=$ARCH VERSION=$VERSION $SIMPLARET --install $pack --skip-checks # check if the package was installed - installed=`eval "ls /$root/var/log/packages/ | egrep '^$pack-[^-]+-[^-]+-[^-]+$'"` + pack="`echo $pack | sed -e 's/\+/\\\+/'`" + installed=`eval "ls /$root/var/log/packages/ | egrep -E '^$pack-[^-]+-[^-]+-[^-]+$'"` check=$? if [ ! -z "$installed" ] && [ "$check" == "0" ]; then diff --git a/trunk/src/simplaret b/trunk/src/simplaret index 20ef8ea..00b0c25 100755 --- a/trunk/src/simplaret +++ b/trunk/src/simplaret @@ -1000,7 +1000,8 @@ function simplaret_solve_dep { local pack="$2" local root="/$3" - installed=`eval "ls $root/var/log/packages/ | egrep '^$pack-[^-]+-[^-]+-[^-]+$'"` + pack="`echo $pack| sed -e 's/\+/\\\+/'`" + installed=`eval "ls $root/var/log/packages/ | egrep -E '^$pack-[^-]+-[^-]+-[^-]+$'"` check=$? if [ -z "$installed" ]; then |