cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally fix the tests/portbump/t8.

Browse Source 
We now force the place for new revisions to be after REVISION mark,
if it exists. This way we don't get extra (and wrong!) REVISION-foo=0
in updated port Makefile.
This commit is contained in:
zhuk 2016-11-06 21:24:35 +00:00
parent 452dbe16e9
commit e90b36e409
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infrastructure/bin/portbump
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl
# $OpenBSD: portbump,v 1.16 2016/11/06 18:26:04 zhuk Exp $
# $OpenBSD: portbump,v 1.17 2016/11/06 21:24:35 zhuk Exp $
#
# Copyright (c) 2014-2016 Vadim Zhukov <zhuk@openbsd.org>
#
@ -670,6 +670,13 @@ sub process_makefile {
$in->input_line_number();
}
# make sure new REVISION-foo won't arise when bumping REVISION
if ($self->{has_global_rev} and $self->{maxrevsin}->{blockend} <
$self->{newrevplace}->{""}->{blockend}) {
$self->{maxrevsin}->{blockend} = $self->{newrevplace}->{""}->{blockend};
$self->{maxrevsin}->{count} = 2; # see _add_new_revs for >1 check
}
return unless $self->{tweak_wantlib};
my $wstart = -1;