From 7efce73e562fe07ad3b3dd2af4bda912babd1920 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Sun, 10 Dec 2006 22:33:39 +0000
Subject: simplaret: simplaret_search_and_download_patch fix

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@66 04377dda-e619-0410-9926-eae83683ac58
---
 src/simplaret | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/simplaret b/src/simplaret
index d6cded1..018e2f4 100755
--- a/src/simplaret
+++ b/src/simplaret
@@ -426,7 +426,7 @@ function simplaret_get {
       else
         echo package $candidate stored at $storage/$repository_name
         simplaret_checksum $storage/$repository_name/CHECKSUMS.md5 $storage/$repository_name/$candidate
-        exit 0
+        return 0
       fi
     fi
 
@@ -436,6 +436,8 @@ function simplaret_get {
 
 function simplaret_search_and_download_patch {
 
+  candidate="`basename $(echo $candidate | cut -d , -f 1)`"
+
   # check if the patch was already downloaded
   if echo $DOWNLOADED_PATCHES | grep -q " $candidate "; then
     return
@@ -523,8 +525,8 @@ function simplaret_get_patches {
   # then get the needed patches for each installed jail
   if [ -s "$JAIL_LIST" ]; then
     for jailpath in `cat $JAIL_LIST`; do
-      if [ -d "/$jailpath/var/log/packages" ]; then
-        simplaret_get_jail_patches /$jailpath
+      if [ -d "$jailpath/var/log/packages" ]; then
+        simplaret_get_jail_patches $jailpath
       fi
     done
   fi
-- 
cgit v1.2.3