[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (abd2d45c5df4a074c17cd8a525ae42c3363f8dbc)

Jaka Kranjc scm at sourcemage.org
Thu Aug 9 16:46:12 EDT 2007


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

 ChangeLog                                     |    5 +++++
 var/lib/sorcery/modules/url_handlers/url_http |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit abd2d45c5df4a074c17cd8a525ae42c3363f8dbc
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    fix url_ftp_verify target matching #13787

commit b98f0501a99b67faa7d4cf12b3845a4a1dc49b0e
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    fix url_ftp_verify #13001

diff --git a/ChangeLog b/ChangeLog
index dfcc2f6..ef6df06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* url_handlers/url_http: fix url_ftp_verify to not pass a deprecated wget
+	  option. Now it works again. #13001
+	  Also made it stricter when checking for target exsistance #13787
+
 2007-05-14 David Brown <dmlb2000 at gmail.com>
 	* sorcery: added a castfs debug level option to sorcery debug dialog
 	  and fixed the text and tabs
diff --git a/var/lib/sorcery/modules/url_handlers/url_http b/var/lib/sorcery/modules/url_handlers/url_http
index ad99515..912753a 100755
--- a/var/lib/sorcery/modules/url_handlers/url_http
+++ b/var/lib/sorcery/modules/url_handlers/url_http
@@ -89,9 +89,9 @@ function url_ftp_verify() {
   if  [  -n  "$URL"  ];  then
     local  FILENAME=`basename $URL`
     local  DIRECTORY=`dirname $URL`
-    local  OUTPUT=`wget --passive-ftp -t 1 -T 30 -O - --spider -nr "$DIRECTORY/" 2>&1`
+    local  OUTPUT=`wget --passive-ftp -t 1 -T 30 -O - --spider -S "$DIRECTORY/" 2>&1`
 
-    if  echo  $OUTPUT  |  grep  -q  "$FILENAME";  then
+    if  echo  $OUTPUT  |  grep  -q  " $FILENAME ";  then
       rm  -f  .listing
     else
       echo  $OUTPUT  |  sed  's/LIST.*//g'



More information about the SM-Commit mailing list