small bugfix

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@333 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index f8518471c534aaba5d5a86bc899b402aaa34f6fe..64e61b422b1dc211b33a8358350d0c9af404bb8a 100644 (file)
--- 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 f331e56b33ab55f41224545f41885bd42f26ed6f..5c53a09d01dc769942fd1a8187c9e958fb7a17ef 100644 (file)
--- 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 20ef8eacb5cbc926cfd78413bfed915dec07802f..00b0c25809b1fc4121aa9dfaa72399db49603986 100755 (executable)
--- 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