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

List:       fink-commits
Subject:    fink/perlmod/Fink Validation.pm,1.193,1.194 ChangeLog,1.1151,1.1152
From:       Daniel Macks <dmacks () users ! sourceforge ! net>
Date:       2005-09-30 17:09:24
Message-ID: E1ELOO1-0001xr-Td () mail ! sourceforge ! net
[Download RAW message or body]

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

Modified Files:
	Validation.pm ChangeLog 
Log Message:
Check .py[co] for presence of %d


Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- Validation.pm	8 Sep 2005 06:16:15 -0000	1.193
+++ Validation.pm	30 Sep 2005 17:09:22 -0000	1.194
@@ -1192,8 +1192,10 @@
 				while (<$la_file>) {
 					if (/$pkgbuilddir/) {
 						&stack_msg($msgs, "Libtool file points to fink build dir.", $filename);
+						last;
 					} elsif (/$pkginstdirs/) {
-						&stack_msg(&msgs, "Libtool file points to fink install dir.", $filename);
+						&stack_msg($msgs, "Libtool file points to fink install dir.", $filename);
+						last;
 					}
 				}
 				close $la_file;
@@ -1202,6 +1204,24 @@
 			}
 		}
 
+		# check that compiled python modules files don't self-identify using temp locations
+		if ($filename =~/\.py[co]$/) {
+			if (open my $py_file, "strings $File::Find::name |") {
+				while (<$py_file>) {
+					if (/$pkgbuilddir/) {
+						&stack_msg($msgs, "Compiled python module points to fink build dir.", $filename);
+						last;
+					} elsif (/$pkginstdirs/) {
+						&stack_msg($msgs, "Compiled python module points to fink install dir.", $filename);
+						last;
+					}
+				}
+				close $py_file;
+			} else {
+				&stack_msg($msgs, "Couldn't read compiled python module file \"$filename\": $!");
+			}
+		}
+
 		# check for privately installed copies of files provided by gettext
 		if ($filename eq "$basepath/lib/charset.alias" and $deb_control->{package} !~ /^libgettext\d*/) {
 			&stack_msg($msgs, "File should only exist in the \"libgettextN\" packages.", $filename);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -d -r1.1151 -r1.1152
--- ChangeLog	30 Sep 2005 16:51:30 -0000	1.1151
+++ ChangeLog	30 Sep 2005 17:09:22 -0000	1.1152
@@ -1,4 +1,9 @@
-2005-09-29  Daniel Macks  <dmacks@netspace.org>
+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.
+	
+2005-09-30  Daniel Macks  <dmacks@netspace.org>
 
 	* Config.pm: Add new --log-output|-l top-level flag.
 	* Engine.pm: Allow logging of build process for each package.



-------------------------------------------------------
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]