Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7700
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
Restrict use of %a to PatchScript.
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- PkgVersion.pm 14 Jul 2004 08:03:02 -0000 1.284
+++ PkgVersion.pm 18 Jul 2004 07:41:11 -0000 1.285
@@ -159,7 +159,6 @@
'D' => $parentdestdir,
'I' => $parentdestdir.$basepath,
- 'a' => $self->{_patchpath},
'b' => '.'
};
@@ -1681,6 +1680,9 @@
$self->run_script($patch_script, "patching (Update* flags)", 0);
$patch_script = "";
+ ### %a expansion only used for processing Patch and in PatchScript
+ $self->{_expand}->{a} = $self->{_patchpath};
+
### patches specified by filename
if ($self->has_param("Patch")) {
foreach $patch (split(/\s+/,$self->param("Patch"))) {
@@ -1691,6 +1693,8 @@
### Deal with PatchScript field
$self->run_script($self->get_patchscript, "patching", 1);
+
+ delete $self->{_expand}->{a}; # don't leak %a expansion
}
sub get_patchscript {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -d -r1.666 -r1.667
--- ChangeLog 18 Jul 2004 02:37:59 -0000 1.666
+++ ChangeLog 18 Jul 2004 07:41:11 -0000 1.667
@@ -1,3 +1,7 @@
+2004-07-18 Daniel Macks <[EMAIL PROTECTED]>
+
+ * PkgVersion.pm: Restrict use of %a to PatchScript.
+
2004-07-17 Benjamin Reed <[EMAIL PROTECTED]>
* VirtPackage.pm: make sure a minimum of java versions are filled
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
