[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fink-commits
Subject:    fink/perlmod/Fink ChangeLog,1.1152,1.1153 Validation.pm,1.194,1.195
From:       Daniel Macks <dmacks () users ! sourceforge ! net>
Date:       2005-09-30 17:33:13
Message-ID: E1ELOl4-0000N4-H0 () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461

Modified Files:
	ChangeLog Validation.pm 
Log Message:
Remember that .deb controlfile Version includes epoch but %b and %d do not.


Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- Validation.pm	30 Sep 2005 17:09:22 -0000	1.194
+++ Validation.pm	30 Sep 2005 17:33:11 -0000	1.195
@@ -1082,8 +1082,14 @@
 	}
 
 	# prepare regexes to check for use of %b, and %d or %D
-	my $pkgbuilddir = sprintf '%s/%s-%s/', map { qr{\Q$_\E} } $buildpath, \
                $deb_control->{source}, $deb_control->{version};  # %b
-	my $pkginstdirs = sprintf '%s/root-(?:%s|%s)-%s/', map { qr{\Q$_\E} } $buildpath, \
$deb_control->{source}, $deb_control->{package}, $deb_control->{version};  # %d or %D \
+	my ($pkgbuilddir, $pkginstdirs); +	{
+		my $vers = $deb_control->{version};
+		$vers = $1 if $vers =~ /:(.*)/;  # epoch not used in %b or %d
+		
+		$pkgbuilddir = sprintf '%s/%s-%s/', map { qr{\Q$_\E} } $buildpath, \
$deb_control->{source}, $vers;  # %b +		$pkginstdirs = sprintf \
'%s/root-(?:%s|%s)-%s/', map { qr{\Q$_\E} } $buildpath, $deb_control->{source}, \
$deb_control->{package}, $vers;  # %d or %D +	}
 
 	# during File::Find loop, we stack all error msgs
 	my $msgs = [ [], {} ];  # poor-man's Tie::IxHash

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1152
retrieving revision 1.1153
diff -u -d -r1.1152 -r1.1153
--- ChangeLog	30 Sep 2005 17:09:22 -0000	1.1152
+++ ChangeLog	30 Sep 2005 17:33:11 -0000	1.1153
@@ -1,5 +1,10 @@
 2005-09-30  Daniel Macks  <dmacks@netspace.org>
 
+	* Validation.pm: Patch checks for %b and %d (%D) in .deb to remove
+	%e from control Version field
+	
+2005-09-30  Daniel Macks  <dmacks@netspace.org>
+
 	* Validation.pm: Add check for .py[c] that hard-code %d.
 	Early-exit from line-by-line checks once we find one match.
 	



-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[prev in list] [next in list] [prev in thread] [next in thread]