Revision: 3535
http://gar.svn.sourceforge.net/gar/?rev=3535&view=rev
Author: skayser
Date: 2009-02-28 11:12:42 +0000 (Sat, 28 Feb 2009)
Log Message:
-----------
gar: small fixes to upstream check
Modified Paths:
--------------
csw/mgar/gar/v1/bin/upstream_watch
csw/mgar/gar/v1/gar.lib.mk
Modified: csw/mgar/gar/v1/bin/upstream_watch
===================================================================
--- csw/mgar/gar/v1/bin/upstream_watch 2009-02-28 02:18:19 UTC (rev 3534)
+++ csw/mgar/gar/v1/bin/upstream_watch 2009-02-28 11:12:42 UTC (rev 3535)
@@ -90,9 +90,9 @@
$http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists
$ENV{HTTP_PROXY};
$http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists
$ENV{http_proxy};
- open (my $FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16;
$ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |");
+ open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16;
$ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |");
- while (my $line = <$FH>) {
+ while (my $line = <FH>) {
my @cols = split (/\s+/, $line);
my $filename = $cols[$#cols];
chomp ($filename);
@@ -103,7 +103,7 @@
push (@file_list, $filename);
}
- close ($FH);
+ close (FH);
return \...@file_list;
}
@@ -123,24 +123,24 @@
$http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists
$ENV{http_proxy};
$wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists
$ENV{http_proxy_cmd};
- open (my $FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep
selected | grep li | grep Download | ");
+ open (FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep
selected | grep li | grep Download | ");
- if (my $line = <$FH>) {
+ if (my $line = <FH>) {
my @cols = split (/"/, $line);
$filename = $cols[3];
chomp ($filename);
}
else {
- close ($FH);
+ close (FH);
return \...@file_list;
}
- close ($FH);
+ close (FH);
$url = "http://downloads.sourceforge.net"; . $filename;
- open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep
package_id= | grep release_id | ");
+ open (FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep
package_id= | grep release_id | ");
- while (my $line = <$FH>) {
+ while (my $line = <FH>) {
my @cols = split (/>/, $line);
my $filename = $cols[2];
chomp ($filename);
@@ -150,7 +150,7 @@
push (@file_list, $filename);
}
- close ($FH);
+ close (FH);
return \...@file_list;
}
Modified: csw/mgar/gar/v1/gar.lib.mk
===================================================================
--- csw/mgar/gar/v1/gar.lib.mk 2009-02-28 02:18:19 UTC (rev 3534)
+++ csw/mgar/gar/v1/gar.lib.mk 2009-02-28 11:12:42 UTC (rev 3535)
@@ -115,9 +115,9 @@
UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES))
SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF))
ifneq ($(UFILES_REGEX), "")
- FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy)
$(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix
',$(UFILES_REGEX))))
+ FILES2CHECK := $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy)
$(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix
',$(UFILES_REGEX))))
else
- FILES2CHECK = ""
+ FILES2CHECK := ""
endif
check-upstream-and-mail:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
