Revision: 22926
http://sourceforge.net/p/gar/code/22926
Author: dmichelsen
Date: 2014-02-01 14:00:10 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Fix wrong ref in scanner.pl
Modified Paths:
--------------
csw/mgar/pkg/mirrorbrain/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile 2014-01-31 12:33:48 UTC (rev
22925)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile 2014-02-01 14:00:10 UTC (rev
22926)
@@ -22,6 +22,9 @@
# http://mirrorbrain.org/issues/issue138
PATCHFILES += 0001-Exit-if-geoip-file-cannot-be-opened.patch
+# Use patch until this is fixed:
+PATCHFILES += 0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
+
VENDOR_URL = http://mirrorbrain.org
# Apache paths
Added:
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
===================================================================
---
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
(rev 0)
+++
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
2014-02-01 14:00:10 UTC (rev 22926)
@@ -0,0 +1,25 @@
+From 5ca8b992d77a3479f1081432d21f8a96382b41c6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Sat, 1 Feb 2014 14:56:06 +0100
+Subject: [PATCH] Do not take ref on a simple scalar string or it wont match
+
+---
+ tools/scanner.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/scanner.pl b/tools/scanner.pl
+index ab9bcb8..4216721 100755
+--- a/tools/scanner.pl
++++ b/tools/scanner.pl
+@@ -774,7 +774,7 @@ sub ftp_readdir
+ return unless defined $ftp;
+ my $text = ftp_cont($ftp, "$url/$name");
+
+- if(!ref($text) && \$text =~ m/^(\d\d\d)\s/) { # some FTP status code?
Not good.
++ if(!ref($text) && $text =~ m/^(\d\d\d)\s/) { # some FTP status code?
Not good.
+
+ # Bug: Net::FTP wrongly reports timeouts (421) as code 550:
+ # sunsite.informatik.rwth-aachen.de: ftp dir:
ftp://sunsite.informatik.rwth-aachen.de/pub/linux/opensuse/distribution/11.0/repo/debug/suse/i686
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
