minor fixes

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

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 26c550f77c453d86cc15efefc6d8d366bf381d00..c4224c8e6e27ba5400f854010912a3c7c40ccd1a 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -799,6 +799,27 @@ function commit_changes {
 
 }
 
+function check_svn_repo {
+
+  # check a svn repository URL
+  # usage: set_svn_repo <repository>
+
+  if [ ! -z "$1" ]; then
+    if echo $1 | grep -q -v -e "^svn://"; then
+      if echo $1 | grep -q -v -e "svn+.\+://"; then
+        if echo $1 | grep -q -v -e "^file://"; then
+          echo $BASENAME: invalid repository URL $1
+          return 1
+        fi
+      fi
+    fi
+  else
+    echo $BASENAME: no repository defined
+    return 1
+  fi
+
+}
+
 # -----------------------------------------------
 #           update jail functions
 # -----------------------------------------------

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 3fe392b63cd636e24adf1a8d5af9ae8b54257a18..4b48854985de79c1b387f89969255cdc2180339e 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -716,7 +716,10 @@ if [ $SIGN_PACKAGES -eq $on ]; then
   fi
 
   if [ ! -z "$SIGN_PACKAGES_USER" ]; then
+    REPOSITORY_OWNER="$(get_owner $(dirname $PACKAGES_DIR))"
+    chown $SIGN_PACKAGES_USER `dirname $PACKAGES_DIR`
     su $SIGN_PACKAGES_USER -c "gpg --use-agent --armor -sb -u $SIGN_KEYID $PACKAGES_DIR/$PKG_NAME"
+    chown $REPOSITORY_OWNER `dirname $PACKAGES_DIR`
   else
     gpg --use-agent --armor -sb -u $SIGN_KEYID $PACKAGES_DIR/$PKG_NAME
   fi

diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index 3f0284ad39e75ab39a33b8ce7bcfc82c1259e895..8d98950a81a8a2d59d3dbf9ff208faf8c076d2ff 100755 (executable)
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -147,27 +147,6 @@ function usage {
 
 }
 
-function check_svn_repo {
-
-  # check a svn repository URL
-  # usage: set_svn_repo <repository>
-
-  if [ ! -z "$1" ]; then
-    if echo $1 | grep -q -v -e "^svn://"; then
-      if echo $1 | grep -q -v -e "^svn+ssh://"; then
-        if echo $1 | grep -q -v -e "^file://"; then
-          echo $BASENAME: invalid repository URL $1
-          return 1
-        fi
-      fi
-    fi
-  else
-    echo $BASENAME: no repository defined
-    return 1
-  fi
-
-}
-
 function import_export_templates {
 
   # import from or export to $TEMPLATE_FOLDER in a svn repository