new config variable STORE_ROOT_PATCHES_ON_PATCHES_DIR

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

1 files changed, 18 insertions, 4 deletions

diff --git a/lib/common.sh b/lib/common.sh
index a729472..8292cb8 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -187,6 +187,9 @@ function eval_config {
 
   if [ -f "$CONF" ]; then
 
+    DEFAULT_ARCH="`eval_parameter DEFAULT_ARCH $(default_arch)`"
+    DEFAULT_VERSION="`eval_parameter DEFAULT_VERSION $(default_version)`"
+
     STORAGE="`eval_parameter STORAGE /var/simplaret/packages`"
     JAIL_ROOT="`eval_parameter JAIL_ROOT /vservers`"
     PATCHES_DIR="`eval_parameter PATCHES_DIR /var/simplaret/patches`"
@@ -201,13 +204,13 @@ function eval_config {
     SIMPLARET_UPDATE="`eval_boolean_parameter SIMPLARET_UPDATE 0`"
     SIMPLARET_DELETE_DURING="`eval_boolean_parameter SIMPLARET_DELETE_DURING 0`"
     SIMPLARET_PURGE_PATCHES="`eval_boolean_parameter SIMPLARET_PURGE_PATCHES 0`"
-    CONSIDER_ALL_PACKAGES_AS_PATCHES="`eval_boolean_parameter CONSIDER_ALL_PACKAGES_AS_PATCHES 0`"
-    DOWNLOAD_EVEN_APPLIED_PATCHES="`eval_boolean_parameter DOWNLOAD_EVEN_APPLIED_PATCHES 0`"
     PASSIVE_FTP="`eval_boolean_parameter PASSIVE_FTP 0`"
     WARNING="`eval_boolean_parameter WARNING 0`"
 
-    DEFAULT_ARCH="`eval_parameter DEFAULT_ARCH $(default_arch)`"
-    DEFAULT_VERSION="`eval_parameter DEFAULT_VERSION $(default_version)`"
+    # Enabling this option (i.e, setting to "1" or "yes"), simplaret will
+    # donwload even # already applied patches, a good option when you plan
+    # to keep local copies of all needed patches for your system
+    DOWNLOAD_EVEN_APPLIED_PATCHES="`eval_boolean_parameter DOWNLOAD_EVEN_APPLIED_PATCHES 0`"
 
     # Enabling this option, jail-upgrade will look at your
     # standard repositories for new packages; if it find a package
@@ -216,6 +219,17 @@ function eval_config {
     # package is apllied; if in doubt, just say no or leave blank.
     CONSIDER_ALL_PACKAGES_AS_PATCHES="`eval_boolean_parameter CONSIDER_ALL_PACKAGES_AS_PATCHES 0`"
 
+    # Enabling this option (i.e, setting to "1" or "yes"), simplaret will
+    # store patches it finds on ROOT repositories on
+    #
+    #   $PATCHES_DIR/$ARCH/$VERSION/root-$repository_name.
+    #
+    # By default this option is turned off because it breaks the standard
+    # way to store packages and can cause some confusion, but its an useful
+    # feature if you like to see all patches apart from common packages and/or
+    # stored in the same tree.
+    STORE_ROOT_PATCHES_ON_PATCHES_DIR="`eval_boolean_parameter STORE_ROOT_PATCHES_ON_PATCHES_DIR 0`"
+
     # now we place "patches" on the top of ROOT_PRIORITY
     ROOT_PRIORITY="patches `echo $ROOT_PRIORITY | sed -e 's/patches//'`"