simplaret: fixed a bug, see info at doc/CHANGELOG

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index b212ca4bb3099a06a8cb8e5c6a3e57fc7ce804b7..2ed75061071c3cd13b070682e3f1a35da35c567e 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,13 @@
 simplepkg changelog
 ===================
 
+0.5pre7
+=======
+
+   - simplaret:
+     - fixed bug for ROOT definitions when there is packages
+       inside of folders different than ROOT_PRIORITY
+
 0.5pre6
 =======
 

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 10d727d61f42c7ec7675a5e13456cf833ea7e630..66f079bb752a867faac281ef0437963d6b5c941a 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.5pre6"
+VERSION="0.5pre7"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 6ac93d7f805d987225bb201e9e18d0be1d88c79e..2f6874365b7a80212eaf3dc4f277319ad4bd1537 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -323,7 +323,7 @@ function simplaret_search {
   # usage: simplaret_search [package-name] [-display_mode]
   # display_mode can be any accepted by simplaret_show_package
 
-  local priority message pattern mode
+  local priority priority_match message pattern mode
 
   if [ ! -z "$1" ] && ! echo $1 | grep -q -e "^-"; then
     pattern="$1"
@@ -360,6 +360,12 @@ function simplaret_search {
             for file in `simplaret_find_package $pattern $storage/$repository_name | grep "/$priority/"`; do
               simplaret_show_package $file $mode
             done
+            priority_match="$priority_match|/$priority/"
+          done
+          # now we should return all matches that are not part of ROOT_PRIORITY
+          priority_match="`echo $priority_match | sed -e 's/^|//'`"
+          for file in `simplaret_find_package $pattern $storage/$repository_name | egrep -v $priority_match`; do
+            simplaret_show_package $file $mode
           done
         else
           for file in `simplaret_find_package $pattern $storage/$repository_name`; do