simplepkg 0.4.9pre14

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 57017ea51f0983af07be4c40634fe195735efdad..ed294086138011b5fd39114bdd14bb371d5cdf76 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,7 +1,7 @@
 simplepkg changelog
 -------------------
 
-0.4.9pre10-13: simplaret small fixes
+0.4.9pre10-14: simplaret small fixes
 
 0.4.9pre9: createpkg:
              - speedup

diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild
index 25f8c6b5be15f994cca8a779904ccb4a661feebf..5647bb8fd6040dbabba47a3548685163cbbb5fdb 100755 (executable)
--- a/simplepkg.SlackBuild
+++ b/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.4.9pre13"
+VERSION="0.4.9pre14"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/src/simplaret b/src/simplaret
index 01fed4ffe4109a8ef21a4b4660f3ea9a18fa29df..b58e41b60a51d96b8c1546982b7074e94a330f0b 100755 (executable)
--- a/src/simplaret
+++ b/src/simplaret
@@ -636,12 +636,14 @@ function simplaret_get_jail_patches {
 
 function simplaret_get_patches {
 
-  local jailpath
+  local jailpath oldroot
 
   if [ "$1" == "--upgrade" ]; then
     IS_UPGRADE="1"
   fi
 
+  oldroot="$ROOT"
+
   # first get patches from the root system
   simplaret_get_jail_patches
 
@@ -649,11 +651,14 @@ function simplaret_get_patches {
   if [ -s "$JAIL_LIST" ]; then
     for jailpath in `cat $JAIL_LIST`; do
       if [ -d "$jailpath/var/log/packages" ]; then
+        ROOT="$jailpath"
         simplaret_get_jail_patches $jailpath
       fi
     done
   fi
 
+  ROOT="$oldroot"
+
 }
 
 function simplaret_checksum {