sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (97402dc2bfecca2d1a4f985434d64dd9ffdc86b4)
- 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 (97402dc2bfecca2d1a4f985434d64dd9ffdc86b4)
- Date: Wed, 22 Apr 2009 15:30:05 -0500
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 1 +
var/lib/sorcery/modules/dl_handlers/dl_aria2 | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 97402dc2bfecca2d1a4f985434d64dd9ffdc86b4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
dl_aria2: added no-check-certificate source hint
diff --git a/ChangeLog b/ChangeLog
index a8faf7f..1a06ea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2009-04-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* dl_svn: check the prefix of the correct url
+ * dl_aria2: added no-check-certificate source hint
2009-04-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: fixed show_up_depends not printing matches that are also
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_aria2
b/var/lib/sorcery/modules/dl_handlers/dl_aria2
index 061d29c..201f4d2 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_aria2
+++ b/var/lib/sorcery/modules/dl_handlers/dl_aria2
@@ -35,7 +35,7 @@ function dl_aria2_get() {
dl_connect || return 255
local ARIA2_OPTIONS
- dl_aria2_set_options "$url_list"
+ dl_aria2_set_options "$url_list" "$hints"
dl_aria2_call_aria2 $target "$url_list"
rc=$?
@@ -77,6 +77,8 @@ function dl_aria2_call_aria2() {
#---------------------------------------------------------------------
function dl_aria2_set_options() {
local URL_LIST=$1
+ local hints="$2"
+
if [ -n "$ACTIVE_FTP" ] ; then
unset PASSIVE
else
@@ -114,12 +116,17 @@ function dl_aria2_set_options() {
URL_HTTP_RETRIES="-m 3"
fi
- #If this option set to false, aria2 doesn't download a file which already
+ # aria doesn't mind if this flag is used on http or ftp urls
+ if list_find "$hints" no-check-certificate; then
+ ARIA2_OPTIONS="--check-certificate=false"
+ fi
+
+ #If --allow-overwrite is false, aria2 doesn't download a file which already
#exists in the file system but its corresponding .aria2 file doesn't exist.
#Default: false
- ALLOW_OVERWRITE="--allow-overwrite=true"
- ARIA2_OPTIONS="$URL_HTTP_TIMEOUT $URL_HTTP_RETRIES $RATE $PASSIVE
$CONTINUE $ALLOW_OVERWRITE"
+ ARIA2_OPTIONS="$ARIA2_OPTIONS --allow-overwrite=true"
+ ARIA2_OPTIONS="$ARIA2_OPTIONS $URL_HTTP_TIMEOUT $URL_HTTP_RETRIES $RATE
$PASSIVE $CONTINUE"
debug 'dl_aria2' "aria2 options: $ARIA2_OPTIONS"
}
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (97402dc2bfecca2d1a4f985434d64dd9ffdc86b4), Jaka Kranjc, 04/22/2009
Archive powered by MHonArc 2.6.24.