Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1417/perlmod/Fink
Modified Files:
Tag: branch_0_29
ChangeLog PkgVersion.pm
Log Message:
backport full_trees fix
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.622.2.4
retrieving revision 1.622.2.5
diff -u -d -r1.622.2.4 -r1.622.2.5
--- PkgVersion.pm 11 May 2009 22:05:03 -0000 1.622.2.4
+++ PkgVersion.pm 28 Jun 2009 09:58:53 -0000 1.622.2.5
@@ -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.1592.2.20
retrieving revision 1.1592.2.21
diff -u -d -r1.1592.2.20 -r1.1592.2.21
--- ChangeLog 6 Jun 2009 14:25:58 -0000 1.1592.2.20
+++ ChangeLog 28 Jun 2009 09:58:53 -0000 1.1592.2.21
@@ -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-05 Benjamin Reed <[email protected]>
* Validation.pm: Allow %p/opt and %p/local
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
