Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1380/perlmod/Fink
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
Fix full_trees for prefices like "/foo/bar/iggy"
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -d -r1.634 -r1.635
--- PkgVersion.pm 11 May 2009 21:57:10 -0000 1.634
+++ PkgVersion.pm 28 Jun 2009 09:58:29 -0000 1.635
@@ -622,7 +622,8 @@
# determine the full package tree, eg: [ qw(stable
main) ]
# front (removed): '', %p, 'fink', 'dists'
- $self->{_full_trees} = [ [ @parts[4..$finkinfo_index-1]
] ];
+ my $skip = () = ($basepath =~ m,[^/]+,g); # count
components of prefix
+ $self->{_full_trees} = [ [
@parts[(3+$skip)..$finkinfo_index-1] ] ];
}
} else {
# for dummy descriptions generated from dpkg status data alone
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1625
retrieving revision 1.1626
diff -u -d -r1.1625 -r1.1626
--- ChangeLog 22 Jun 2009 16:12:35 -0000 1.1625
+++ ChangeLog 28 Jun 2009 09:58:29 -0000 1.1626
@@ -1,3 +1,8 @@
+2009-06-28 Dave Vasilevsky <[email protected]>
+
+ * PkgVersion.pm: Calculate full_trees correctly when prefix has
+ multiple directory components.
+
2009-06-22 Benjamin Reed <[email protected]>
* Validation.pm: Allow @executable_path and friends to be private libs
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
