Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10052
Modified Files:
Engine.pm PkgVersion.pm ChangeLog
Log Message:
Fix bug when %b is used in %c.
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -d -r1.493 -r1.494
--- PkgVersion.pm 11 Nov 2005 01:59:38 -0000 1.493
+++ PkgVersion.pm 11 Nov 2005 21:08:29 -0000 1.494
@@ -813,6 +813,8 @@
sub prepare_percent_c {
my $self = shift;
+ $self->get_build_directory; # make sure we have %b
+
my $pct_c;
if ($self->is_type('perl')) {
# grab perl version, if present
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -d -r1.340 -r1.341
--- Engine.pm 11 Nov 2005 01:59:38 -0000 1.340
+++ Engine.pm 11 Nov 2005 21:08:29 -0000 1.341
@@ -2091,7 +2091,6 @@
foreach my $pkg (@pkglist) {
$pkg->prepare_percent_c;
- $pkg->get_build_directory;
# default to all fields if no fields or %expands specified
if ($wantall or not (@fields or @percents)) {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1187
retrieving revision 1.1188
diff -u -d -r1.1187 -r1.1188
--- ChangeLog 11 Nov 2005 01:59:38 -0000 1.1187
+++ ChangeLog 11 Nov 2005 21:08:29 -0000 1.1188
@@ -1,3 +1,8 @@
+2005-11-11 Daniel Macks <[EMAIL PROTECTED]>
+
+ * Engine.pm, PkgVersion.pm: perpare_percent_c calls
+ get_build_directory internally because %c might contain %b.
+
2005-11-09 Daniel Macks <[EMAIL PROTECTED]>
* PkgVersion.pm: Set ownership of temp HOME dir to nobody when
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
