Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14644/perlmod/Fink
Modified Files:
Tag: branch_0_29
ChangeLog Engine.pm Validation.pm
Log Message:
backport un-needed (we think!) logic-change in mainloop and new gtk-doc val test
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.431.2.1
retrieving revision 1.431.2.2
diff -u -d -r1.431.2.1 -r1.431.2.2
--- Engine.pm 8 Apr 2009 05:14:13 -0000 1.431.2.1
+++ Engine.pm 14 Apr 2009 07:44:50 -0000 1.431.2.2
@@ -1925,7 +1925,7 @@
$any_installed = 0;
PACKAGELOOP: foreach $pkgname (sort keys %deps) {
$item = $deps{$pkgname};
- next if (not defined $item or ($item->[FLAG] & 2) ==
2); # already installed
+ next if (($item->[FLAG] & 2) == 2); # already
installed
$all_installed = 0;
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.303.2.2
retrieving revision 1.303.2.3
diff -u -d -r1.303.2.2 -r1.303.2.3
--- Validation.pm 9 Apr 2009 05:19:35 -0000 1.303.2.2
+++ Validation.pm 14 Apr 2009 07:44:50 -0000 1.303.2.3
@@ -1818,7 +1818,6 @@
lstat $File::Find::name;
$dpkg_file_count++ if -f _ || -l _;
-
# check that there won't be collisions on case-insensitive
# filesystems. Will only be triggered on pkgs built in
# case-sensitive filesystems (if case-insensitive, the files
@@ -1828,6 +1827,25 @@
&stack_msg($msgs, "Pathname collision on
case-insensitive filesystems", $filename);
}
+ # check that gtk-doc (devhelp) documenation cross-links aren't
+ # obviously incorrect local URLs
+ if ($filename =~/$basepath\/share\/gtk-doc\/.+\.html$/) {
+ if (!-l $File::Find::name and open my $gtkdocfile, '<',
$File::Find::name) {
+ my %seen_lines = (); # only print one example
of each bad line
+ while (<$gtkdocfile>) {
+ chomp;
+ if (/href\s*=\s*[\"\']?(\/[^\/]+)/) {
+ if ($1 ne $basepath and
!$seen_lines{$_}++) {
+ &stack_msg($msgs, "Bad
local URL (\"$1\" does not look like a fink location).", $filename, $_);
+ }
+ }
+ }
+ close $gtkdocfile;
+ } elsif (!-l _) {
+ &stack_msg($msgs, "Couldn't read gtk-doc file
\"$filename\": $!");
+ }
+ }
+
}; # end of CODE ref block
# check each file in the %d hierarchy according to the above-defined sub
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1592.2.4
retrieving revision 1.1592.2.5
diff -u -d -r1.1592.2.4 -r1.1592.2.5
--- ChangeLog 14 Apr 2009 02:49:52 -0000 1.1592.2.4
+++ ChangeLog 14 Apr 2009 07:44:50 -0000 1.1592.2.5
@@ -1,3 +1,8 @@
+2009-04-14 Daniel Macks <[email protected]>
+
+ * Engine.pm: Undo change to PACKAGELOOP that is no longer needed
+ * Validation.pm: Catch gtk-doc HREF to non-fink locations
+
2009-04-13 Dave Morrison <[email protected]>
* PkgVersion.pm: don't use new style perl compiling for 5.10.0 under
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
