simplepkg 0.4.9pre21

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index e4dcb344b2b076f9f65801ed4f31e490ec5f73de..d97ff75cad428464ba4d02d48dcbb6f370cce452 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,10 +1,10 @@
 simplepkg changelog
 -------------------
 
-0.4.9pre20: simplaret:
-            - enhanced http retrieval: curl support
-            - enhanced verbosity
-            - get-patches small changes
+0.4.9pre18-21: simplaret:
+               - enhanced http retrieval: curl support
+               - enhanced verbosity
+               - get-patches small changes
 
 0.4.9pre10-17: lots of simplaret fixes
 

diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild
index 4d6821389676768532ddd8953b27fbc86f3706fb..52a3effafea0d7e42f9998b341e7dca23b139e08 100755 (executable)
--- a/simplepkg.SlackBuild
+++ b/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.4.9pre20"
+VERSION="0.4.9pre21"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/src/simplaret b/src/simplaret
index 3876c37b7c7e7aec47414c76709834f7969ef471..4b472b82289b19fcb24ec09bb6ebbcd36594909c 100755 (executable)
--- a/src/simplaret
+++ b/src/simplaret
@@ -151,10 +151,6 @@ function simplaret_download {
 
   fi
 
-  if [ "$4" == "--no-verbose" ]; then
-    echo ""
-  fi
-
 }
 
 function simplaret_repository {
@@ -554,8 +550,9 @@ function simplaret_search_and_download_patch {
 
   # check if the patch was already downloaded
   if echo "$DOWNLOADED_PATCHES" | grep -q " $ARCH:$VERSION:$sugested "; then
-    echo "Jail $root needs package $sugested (already downloaded, skipping)"
     if [ "$IS_UPGRADE" != "1" ]; then
+      echo Package $sugested already downloaded
+      # echo "Jail $root needs package $sugested (already downloaded, skipping)"
       return
     fi
   fi
@@ -657,6 +654,7 @@ function simplaret_get_jail_patches {
   if ! echo "$DISTRO_UPDATED" | grep -q " $ARCH:$VERSION "; then
     simplaret_update
     DISTRO_UPDATED="$DISTRO_UPDATED $ARCH:$VERSION " # the ending space is important
+    echo ""
   fi
 
   echo Fetching patches for arch $ARCH and version $VERSION for jail $root