Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31811
Modified Files:
ChangeLog PkgVersion.pm Validation.pm
Log Message:
Now that we are cleanly converted to PatchFile, kill off old Patch field
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -d -r1.623 -r1.624
--- PkgVersion.pm 6 Apr 2009 02:24:12 -0000 1.623
+++ PkgVersion.pm 9 Apr 2009 05:36:58 -0000 1.624
@@ -3482,11 +3482,8 @@
### patches specified by filename
if ($self->has_param("Patch")) {
- foreach $patch (split(/\s+/,$self->param("Patch"))) {
- $patch_script .= "patch -p1 <\%a/$patch\n";
- }
+ die "\"Patch\" is no longer supported\n";
}
- $self->run_script($patch_script, "patching (patchfiles)", 0, 1);
### Deal with PatchScript field
$self->run_script($self->get_script("PatchScript"), "patching", 1, 1);
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- Validation.pm 9 Apr 2009 05:23:09 -0000 1.309
+++ Validation.pm 9 Apr 2009 05:36:58 -0000 1.310
@@ -374,7 +374,7 @@
my $filename = shift;
my $val_prefix = shift;
my ($properties, $info_level, $test_properties);
- my ($pkgname, $pkginvarname, $pkgversion, $pkgrevision, $pkgfullname,
$pkgdestdir, $pkgpatchpath, @patchfiles);
+ my ($pkgname, $pkginvarname, $pkgversion, $pkgrevision, $pkgfullname,
$pkgdestdir, $pkgpatchpath);
my $value;
my ($basepath, $buildpath);
my ($type, $type_hash);
@@ -829,7 +829,6 @@
}
# Verify the patch file(s) exist and check some things
- @patchfiles = ();
# anything in PatchScript that looks like a patch file name
# (i.e., strings matching the glob %a/*.patch)
$value = $properties->{patchscript} || $test_properties->{patchscript};
@@ -839,26 +838,18 @@
}
# the contents if Patch (if any)
- $value = $properties->{patch} || $test_properties->{patch};
- if ($value) {
- # add directory if info is not simple filename (not in $PWD)
- $value = "\%a/" .$value if $pkgpatchpath;
- unshift @patchfiles, $value;
+ if ($properties->{patch} || $test_properties->{patch}) {
if (exists $properties->{patchscript}) {
- print "Warning: The Patch field is deprecated. Use
PatchFile, and \%\{PatchFile\} to apply the patch explicitly in PatchScript.
($filename)\n";
+ print "Error: The Patch field is no longer supported.
Use PatchFile, and \%\{PatchFile\} to apply the patch explicitly in
PatchScript. ($filename)\n";
} else {
- print "Warning: The Patch field is deprecated. Use
PatchFile instead. ($filename)\n";
+ print "Error: The Patch field is no longer supported.
Use PatchFile instead. ($filename)\n";
}
$looks_good = 0;
}
- # the contents if PatchFile (if any)
+ # check the contents of PatchFile (if any)
if (exists $expand->{patchfile}) {
- unshift @patchfiles, '%{patchfile}';
- }
-
- # now check each one in turn
- foreach $value (@patchfiles) {
+ $value = '%{patchfile}';
$value = &expand_percent($value, $expand, $filename.' Patch');
unless (-f $value) {
print "Error: can't find patchfile \"$value\"\n";
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1600
retrieving revision 1.1601
diff -u -d -r1.1600 -r1.1601
--- ChangeLog 9 Apr 2009 05:23:09 -0000 1.1600
+++ ChangeLog 9 Apr 2009 05:36:58 -0000 1.1601
@@ -1,5 +1,9 @@
2009-04-09 Daniel Macks <[email protected]>
+ * PkgVersion.pm, Validation.pm: .info "Patch" field is gone
+
+2009-04-09 Daniel Macks <[email protected]>
+
* Validation.pm: kill %a harder
2009-04-08 Dave Morrison <[email protected]>
------------------------------------------------------------------------------
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
