see doc/CHANGELOG for details

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

diff --git a/trunk/conf/simplepkg.conf.new b/trunk/conf/simplepkg.conf.new
index 28af9a73ff80a00402b4200b07405826daaeb4ca..a6ed9a43cce4447ce649e9be6eb54f45c1aa692a 100644 (file)
--- a/trunk/conf/simplepkg.conf.new
+++ b/trunk/conf/simplepkg.conf.new
@@ -13,6 +13,10 @@
 # where jails are placed
 JAIL_ROOT="/vservers"
 
+# wheter mkjial should add new jails in the jail list
+# to enable it, set to "1" or "yes"
+ADD_TO_JAIL_LIST="1"
+
 # whether mkjail should clean the package cache before installation
 # to enable it, set to "1" or "yes"
 SIMPLARET_CLEAN="1"

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 6a8fcc003ac3940f9efb62b88ad42e46e1b62b85..b212ca4bb3099a06a8cb8e5c6a3e57fc7ce804b7 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,16 @@
 simplepkg changelog
 ===================
 
+0.5pre6
+=======
+
+   - repos:
+     - FILE_LIST generation fix
+
+   - mkjail:
+     - new config variable ADD_TO_JAIL_LIST controls wheter to
+       add new jails into the JAIL_LIST file
+
 0.5pre5
 =======
 

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index e5f6aedee72b08a1d117f33156c7c68bb9902ef2..1eff3346ccaf6b59f271902235932dd85171d26a 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -211,6 +211,7 @@ function eval_config {
     SIGNATURE_CHECKING="`eval_boolean_parameter SIGNATURE_CHECKING 0`"
     DEPENDENCY_CHECKING="`eval_boolean_parameter DEPENDENCY_CHECKING 1`"
     TEMPLATES_UNDER_SVN="`eval_boolean_parameter TEMPLATES_UNDER_SVN 0`"
+    ADD_TO_JAIL_LIST="`eval_boolean_parameter ADD_TO_JAIL_LIST 1`"
 
     # Enabling this option (i.e, setting to "1" or "yes"), simplaret will
     # donwload even # already applied patches, a good option when you plan

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index e0ccd54582388032ecde77034e456bd0ebe3cafa..10d727d61f42c7ec7675a5e13456cf833ea7e630 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.5pre5"
+VERSION="0.5pre6"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/trunk/src/mkjail b/trunk/src/mkjail
index 43669e11711830546eb00d3a3d0dab03004d5a11..f6c935c143ef3abb6c1fb37fb697c0ef3050dc3f 100755 (executable)
--- a/trunk/src/mkjail
+++ b/trunk/src/mkjail
@@ -61,9 +61,11 @@ function jailist_update {
   # update the jail list file
   # usage: jailist_update <jail-path>
 
-  touch $JAIL_LIST
-  if ! grep -q -e "^$1\$" $JAIL_LIST; then
-    echo $1 >> $JAIL_LIST
+  if [ "$ADD_TO_JAIL_LIST" == "1" ]; then
+    touch $JAIL_LIST
+    if ! grep -q -e "^$1\$" $JAIL_LIST; then
+      echo $1 >> $JAIL_LIST
+    fi
   fi
 
 }

diff --git a/trunk/src/repos b/trunk/src/repos
index 95a3936eefb6eae78d6a069d172a30af6c98f9e2..c37e625c5f7a83e5f55cba687a08150236ff216b 100755 (executable)
--- a/trunk/src/repos
+++ b/trunk/src/repos
@@ -30,11 +30,16 @@ function svn_add_meta {
 
 function gen_filelist {
 
+  local cwd
+
   for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILELIST.TXT
   echo "Created new FILELIST.TXT"
   if [ -d "patches" ]; then
-    for file in `find patches | grep -e ".tgz$"`; do ls -l $file; done > patches/FILE_LIST
+    cwd="`pwd`"
+    cd patches  
+    for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILE_LIST
     echo "Created new patches/FILE_LIST"
+    cd $pwd
   fi
 
 }