simplaret: simplaret_get_jail_patches small fix

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

diff --git a/conf/repos.conf.new b/conf/repos.conf.new
index 9ecfab9c87d3e7973d8123c040a8ae6bbf3a5e67..35c76d69a23ba040cd0b4b39bc30492004fe91d7 100644 (file)
--- a/conf/repos.conf.new
+++ b/conf/repos.conf.new
@@ -9,15 +9,17 @@ ROOT-x86_64="sarava%http://slack.sarava.org/slamd64/"
 ROOT-x86_64="slackadelic%http://mirror1.slackadelic.com/slamd64/"
 ROOT-x86_64="heanet%http://ftp.heanet.ie/pub/slamd64/"
 
+# noarch
+NOARCH="sarava%http://slack.sarava.org/packages/noarch"
+
 # 10.2
 REPOS-i386-10.2="sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/"
-REPOS-i386-10.2="sarava-noarch%http://slack.sarava.org/packages/noarch/"
 REPOS-x86_64-10.2="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/"
-REPOS-x86_64-10.2="sarava-noarch%http://slack.sarava.org/packages/noarch/"
+
+# 10.2b
+REPOS-x86_64-10.2b="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2b/"
 
 # 11.0
 REPOS-i386-11.0="sarava%http://slack.sarava.org/packages/slackware/slackware-11.0/"
-REPOS-i386-11.0="sarava-noarch%http://slack.sarava.org/packages/noarch/"
 REPOS-x86_64-11.0="sarava%http://slack.sarava.org/packages/slamd64/slamd64-11.0/"
-REPOS-x86_64-11.0="sarava-noarch%http://slack.sarava.org/packages/noarch/"
 

diff --git a/src/simplaret b/src/simplaret
index e08d9ba9a834537cd466a24e222c9e199618ee5f..65d05aa9f4c1c382f681a7daacbac0b00d769fa1 100755 (executable)
--- a/src/simplaret
+++ b/src/simplaret
@@ -485,18 +485,18 @@ function simplaret_get_jail_patches {
   echo fetching patches for arch $ARCH and version $VERSION for jail $root
 
   # list all available patches in PATCHES repositories
-  for candidate in `simplaret_search -formatted | grep PATCHES`; do
+  for candidate in `simplaret_search -formatted | grep patches`; do
     simplaret_search_and_download_patch
   done
 
   # list all available patches in ROOT repositories
-  for candidate in `simplaret_search patches -formatted | grep ROOT`; do
+  for candidate in `simplaret_search patches -formatted | grep root`; do
     simplaret_search_and_download_patch
   done
 
   # grab patches from every other places
   if [ "$CONSIDER_ALL_PACKAGES_AS_PATCHES" == "1" ]; then
-    for candidate in `simplaret_search patches | grep -v PATCHES | grep -v ROOT`; do
+    for candidate in `simplaret_search patches | grep -v patches | grep -v root`; do
       simplaret_search_and_download_patch
     done
   fi