diff options
| -rw-r--r-- | doc/CHANGELOG | 2 | ||||
| -rwxr-xr-x | simplepkg.SlackBuild | 2 | ||||
| -rwxr-xr-x | src/simplaret | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 57017ea..ed29408 100644 --- 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 25f8c6b..5647bb8 100755 --- 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 01fed4f..b58e41b 100755 --- 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 { |