mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

- Patch to ports-mgmt/portupdate-scan to deal with problems which have surfaced

Browse Source 
recently, parsing the files /usr/ports/MOVED and /usr/ports/UPDATING. MOVED had
an extra blank line on the end for awhile, and the case of some of the UPDATING
lines have changed (e.g., Author: instead of AUTHOR:). This patch allows
portupdate-scan to tolerate these variances.

PR:		ports/125840
Submitted by:	Alex Stangl <alex@stangl.us> (maintainer)
This commit is contained in:
Beech Rintoul 2008-07-24 18:18:03 +00:00
parent 89c85416ec
commit c46d8b0112
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=217434
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portupdate-scan/Makefile
View File

@ -7,7 +7,7 @@
# This port is self contained in the files directory.
PORTNAME= portupdate-scan
PORTVERSION= 0.2
PORTVERSION= 0.3
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

13
ports-mgmt/portupdate-scan/src/portupdate-scan
View File

@ -19,7 +19,8 @@
# Intended to be used prior to upgrading ports
# Usage: portupdatescan [-dDhmuvV] [--help] [--version]
# Created: 2006/12/21 Alex Stangl
# Last updated: 2008/02/04 Alex Stangl INDEX computation change from Tom Doherty
# Updates: 2008/02/04 Alex Stangl INDEX computation change from Tom Doherty
# 2008/07/21 Alex Stangl Tolerate problems w/ MOVED & UPDATING
use Text::ParseWords;
use Getopt::Std;
@ -41,7 +42,7 @@ EOF
}
sub VERSION_MESSAGE() {
print "portupdate-scan 0.1\n";
print "portupdate-scan 0.3\n";
}
# Fetch cmdline args, display usage if appropriate
@ -82,10 +83,10 @@ sub processBlock(@) {
my ($affects, $remainder, $line);
my $index = 0;
foreach $line (@_) {
if ($line =~ /^\s*AFFECTS:/) {
if ($line =~ /^\s*AFFECTS:/i) {
$affects = $line;
$remainder = $index;
} elsif ($affects and $line =~ /^\s*AUTHOR/) {
} elsif ($affects and $line =~ /^\s*AUTHOR/i) {
last;
} elsif ($affects) {
$affects .= $line;
@ -317,7 +318,9 @@ MAIN:{
open(MOVED, $movedFile) or die "Can't open $movedFile: $!";
while(<MOVED>) {
chomp;
if ($_ !~ /^\s*#/) {
if ($_ =~ /^\s*$/) {
print "+ Ignoring MOVED line containing no non-whitespace chars.\n" if $opt{d};
} elsif ($_ !~ /^\s*#/) {
my ($from, $to) = ($_ =~ /^([^|]*)\|([^|]*)/)
or die "$_ is not a correctly formed MOVED line";