fixes

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 657ae799deffc67c2a6842c04ddb968ca8291d92..5f02b0448763f5d636f23223e1eda8e879cdb85c 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -20,7 +20,9 @@ simplepkg changelog
     - repos.conf and simplepkg.conf:
       - default configuration making createpkg repository integrated with simplaret
       - new repositories
-    - mkbuild: some svn check routines extended for git
+    - mkbuild:
+      - function svn_mkdir moved to common.sh
+      - some svn check routines extended for git
     - perl.mkSlackBuild
        - added sections copy_init_scripts and copy_config_files
     - generic.mkSlackBuild and per.mkSlackBuild

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 21cf9be777d064a54945b6afcd5739abd1376e36..93f1e0a4dbe5c34e1c3b70c3870608d7087e86ae 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -580,6 +580,25 @@ function svn_add {
 
 }
 
+function svn_mkdir {
+
+  # svn make directory
+  [ $# -ne 1 ] && handle_error $ERROR_PAR_NUMBER
+
+  DIR_LIST=`echo $1 | tr '/' ' '`
+
+  DIR=""
+  for i in $DIR_LIST; do
+    DIR=$DIR/$i
+    if [ ! -e ${DIR:1} ]; then
+      su_svn mkdir ${DIR:1}
+    elif [ -d "${DIR:1}" ] && [ ! -d "${DIR:1}/.svn" ]; then
+      su_svn add ${DIR:1}      
+    fi
+  done
+
+}
+
 # -----------------------------------------------
 #           update jail functions
 # -----------------------------------------------

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index fe52d4f852ad3be4f5866c66cf5fed46ebc9cf7b..1ab48a6e47fd45ea028e4108771c6fbf333d6eb6 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -526,12 +526,12 @@ PKG_NAME="`ls -1 -c $MAKEPKG_REPOS/$PACKAGE-*-*-*.tgz | head -n 1 | xargs basena
 
 # Create repository directory
 if [ ! -e $NEW_REPOS ]; then
-  mkdir -p $NEW_REPOS || mkdir -p $NEW_REPOS
+  mkdir -p $NEW_REPOS
   if [ -d "$MAKEPKG_REPOS/.svn" ] && ! svn_check $NEW_REPOS; then
     cwd="`pwd`"
     cd $MAKEPKG_REPOS
     chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
-    su_svn add $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
+    svn_mkdir $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
     cd $cwd
   fi
 fi

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index efc3adcdb6de5b854edf3f4ddceb411cad41db27..98d7b5c10cb92ff261977ab51faf27e5051fbfe2 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -603,23 +603,7 @@ function commit_mkbuild {
 
 }
 
-function svn_mkdir {
-
-  # svn make directory
-  [ $# -ne 1 ] && handle_error $ERROR_PAR_NUMBER
-
-  DIR_LIST=`echo $1 | tr '/' ' '`
-
-  DIR=""
-  for i in $DIR_LIST; do
-    DIR=$DIR/$i
-    if [ ! -e ${DIR:1} ]; then
-      su_svn mkdir ${DIR:1}
-    fi
-  done
-
-}
-
+# TODO: merge with svn_add function from common.sh
 function svn_add {
 
   # svn add file
@@ -627,7 +611,7 @@ function svn_add {
 
   # copy file
   if [ -e $2/$1 ]; then
-    echo "$2/$1 exist. Overwriter it."
+    echo "$2/$1 exists. Overwrite it."
     cp $WORK/$1 $2/
   else
     cp $WORK/$1 $2/