Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (0d0bc354f3b04577936c3dfeea559daec170f2e7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (0d0bc354f3b04577936c3dfeea559daec170f2e7)
  • Date: Tue, 21 Apr 2009 11:26:02 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 2 ++
var/lib/sorcery/modules/dl_handlers/dl_svn | 10 +++++++---
2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 0d0bc354f3b04577936c3dfeea559daec170f2e7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

dl_svn: support the no-check-certificate source hint #1504

commit 9c31cc926268fd139290cbe394ca00d0f84bc605
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

dl_svn: don't pass --no-interactive twice or never in some cases

diff --git a/ChangeLog b/ChangeLog
index bf0fb81..f40d97a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
providers
* libdepends, gaze: made show_up_depends and gaze also display runtime
dependencies by default
+ * dl_svn: don't pass --no-interactive twice or never in some cases
+ support the no-check-certificate source hint #15045

2009-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* delve: fixed typo in help
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_svn
b/var/lib/sorcery/modules/dl_handlers/dl_svn
index cd71806..b39311e 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_svn
+++ b/var/lib/sorcery/modules/dl_handlers/dl_svn
@@ -43,13 +43,17 @@ function dl_svn_get () {
local SVN_ROOT=$(echo $SVN_ROOT|sed 's#//\(.*\)@#//#')
local USER=${USER_PASS%:*};
local PASS=${USER_PASS#*:};
- svn_args="--username $USER --password $PASS "
+ svn_args="$svn_args --username $USER --password $PASS"
+ fi
+
+ if list_find "$hints" no-check-certificate && [[ $(url_get_prefix
"$URL") == svn_https ]]; then
+ svn_args="$svn_args --trust-server-cert"
fi

if test -d $target; then
message "${MESSAGE_COLOR}Running svn update...${DEFAULT_COLOR}"
- echo svn update $svn_args --non-interactive -r $SVN_TAG $target
- svn update $svn_args --non-interactive -r $SVN_TAG $target
+ echo svn update $svn_args -r $SVN_TAG $target
+ svn update $svn_args -r $SVN_TAG $target
rc=$?
eval "$dl_target=\"$target\""
else



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (0d0bc354f3b04577936c3dfeea559daec170f2e7), Jaka Kranjc, 04/21/2009

Archive powered by MHonArc 2.6.24.

Top of Page