[projects/distfiles] Allow urls like 'https://pypi.python.org/packages/source/d/dugong/dugong-%{version}.tar.bz2#md5=f81b

arekm arekm at pld-linux.org
Thu Jun 12 14:57:03 CEST 2014


commit 7263fd0318938f3a94f2a0b653e6d283db7a8785
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Jun 12 14:56:59 2014 +0200

    Allow urls like 'https://pypi.python.org/packages/source/d/dugong/dugong-%{version}.tar.bz2#md5=f81bc01e7656ced466e1eb059952c21f'.

 file-fetcher.pl | 2 +-
 specparser.pl   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/file-fetcher.pl b/file-fetcher.pl
index 2246247..09cdfaa 100755
--- a/file-fetcher.pl
+++ b/file-fetcher.pl
@@ -77,7 +77,7 @@ sub read_spool_file()
       $problems .= $_;
       next;
     }
-    if (/^([a-f0-9]{32})\s+((ftp|http|https|no-url|no-url-copy):\/\/([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?)\s*$/) {
+    if (/^([a-f0-9]{32})\s+((ftp|http|https|no-url|no-url-copy):\/\/([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/\#_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?)\s*$/) {
       if (/\/$/) {
         $problems .= "$file: cannot fetch dir";
       } else {
diff --git a/specparser.pl b/specparser.pl
index 3b7e787..510fbc5 100755
--- a/specparser.pl
+++ b/specparser.pl
@@ -281,7 +281,7 @@ sub print_source($$$) # {{{
 {
 	my ($no, $md5, $s) = @_;
 
-	if ($s =~ /^([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?$/) {
+	if ($s =~ /^([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/\#_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?$/) {
 		if ($s =~ /^(ftp|http|https):\/\//) {
 			if ($s =~ /\/$/) {
 				error("source $no ($s) is directory");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/distfiles.git/commitdiff/7263fd0318938f3a94f2a0b653e6d283db7a8785



More information about the pld-cvs-commit mailing list