last commit of the day

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

diff --git a/conf/repos.conf.new b/conf/repos.conf.new
index 35c76d69a23ba040cd0b4b39bc30492004fe91d7..cd3b9abf2ec668d726efd5cb5675466c1e868b02 100644 (file)
--- a/conf/repos.conf.new
+++ b/conf/repos.conf.new
@@ -1,5 +1,5 @@
 #
-# repositories definitions for simplaret
+# repository definitions for simplaret
 #
 
 # root repositories
@@ -8,18 +8,32 @@ ROOT-i386="sarava%http://slack.sarava.org/slackware/"
 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/"
+ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/"
 
 # noarch
 NOARCH="sarava%http://slack.sarava.org/packages/noarch"
 
-# 10.2
+# i386 10.2
 REPOS-i386-10.2="sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/"
+PATCHES-i386-10.2="sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/pacthes/"
+
+# x86_64 10.2
 REPOS-x86_64-10.2="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/"
+PATCHES-x86_64-10.2="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/patches/"
 
-# 10.2b
+# x86_64 10.2b
 REPOS-x86_64-10.2b="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2b/"
+PATCHES-x86_64-10.2b=""sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2b/patches/"
 
-# 11.0
+# i386 11.0
 REPOS-i386-11.0="sarava%http://slack.sarava.org/packages/slackware/slackware-11.0/"
+PATCHES-i386-11.0="sarava%http://slack.sarava.org/packages/slackware/slackware-11.0/patches/"
+
+# x86_64 11.0
 REPOS-x86_64-11.0="sarava%http://slack.sarava.org/packages/slamd64/slamd64-11.0/"
+PATCHES-x86_64-11.0="sarava%http://slack.sarava.org/slamd64/slamd64-11.0/patches/"
+
+# powerpc 11.0
+REPOS-powerpc-11.0="sarava%http://slack.sarava.org/packages/slackintosh/slackintosh-11.0/"
+PATCHES-powerpc-11.0="sarava%http://slackintosh.workaround.ch/pub/slackintosh/11.0/patches/"
 

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index d0669944b69f596f825f1da3b6d40afc77d948b8..7ec3a656837532ab610292694381bbcef6129ff4 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,7 +1,8 @@
 simplepkg changelog
 -------------------
 
-0.4.10pre1: jail-upgrade:
+0.4.10pre1: repos: added patches/ metafile creation
+            jail-upgrade:
              - added option CONSIDER_ALL_PACKAGES_AS_PATCHES
              - merged swaret and simplaret upgrade procedures
              - act recursively on patches' folder
@@ -17,6 +18,8 @@ simplepkg changelog
                 in the local repository has the same version and
                 build number, otherwise erase the old and download
                 the new one.
+              - fixed --get-paches
+              - added --upgrade option
 
 0.4.9: released 0.4.9pre6 as 0.4.9
 

diff --git a/src/jail-upgrade b/src/jail-upgrade
index c44f32d5bd4f24c974ebab62b932c7bf9ee5545a..fffc0990fa59264bb1b3f9d7cc6d8bbb497a18fc 100755 (executable)
--- a/src/jail-upgrade
+++ b/src/jail-upgrade
@@ -57,7 +57,6 @@ function jail_upgrade {
     elif [ "$SIMPLARET" == "swaret" ]; then
       echo error: cant upgrade on $1: no such patch dir $patches_dir
     fi
-    return
   fi
 
   # optionally, search all packages in the repositories and apply a patch if:

diff --git a/src/simplaret b/src/simplaret
index 4f8a4cd5bbbc54b215c190df6dcd411f271ca3cb..1cef677a131b4a91878bfe5612933c2b7f4c713c 100755 (executable)
--- a/src/simplaret
+++ b/src/simplaret
@@ -514,6 +514,9 @@ function simplaret_get_jail_patches {
 
   # grab patches from every other places
   if [ "$CONSIDER_ALL_PACKAGES_AS_PATCHES" == "1" ]; then
+    # TODO: for sugested in `simplaret_search -formatted`; do
+    #       and also think yet some more about this scheme... does ROOT/patches
+    #       should be dealed as a PATCHES repository?
     for sugested in `simplaret_search patches -formatted | grep -v patches`; do
       simplaret_search_and_download_patch
     done