summaryrefslogtreecommitdiff
path: root/Porting/makerel
diff options
context:
space:
mode:
authorRicardo Signes <rjbs@cpan.org>2012-02-20 17:35:29 -0500
committerRicardo Signes <rjbs@cpan.org>2012-02-20 18:09:10 -0500
commit699a100d18271a1f1a0c15c2f52c2ebe8e077995 (patch)
tree8b529286bd890f1c478e37728d9bfc9fe5a14204 /Porting/makerel
parent8f4390f7214488e43b5a5a02fe8c983dcb0c636b (diff)
downloadperl-699a100d18271a1f1a0c15c2f52c2ebe8e077995.tar.gz
makerel should not add -uncommitted to tarballs
For some time now (I suspect since 691ce773f), makerel has always tried to build releases as perl-5.x.y-uncommitted.tar.gz. This always confuses and/or panics new release engineers, who see the error before the "don't worry, use -s ''" advice in the RMG. This change just makes makerel skip the usually-#ifdef-ed-away line that is getting that -uncommitted. makerel still picks up other locally-applied patches, but will skip uncommitted.
Diffstat (limited to 'Porting/makerel')
-rwxr-xr-xPorting/makerel5
1 files changed, 3 insertions, 2 deletions
diff --git a/Porting/makerel b/Porting/makerel
index 082c9e5720..3fe610f1b2 100755
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -62,8 +62,9 @@ $vers = sprintf("%d.%d.%d", $revision, $patchlevel, $subversion);
# fetch list of local patches
my (@local_patches, @lpatch_tags, $lpatch_tags);
-@local_patches = grep { /^static.*local_patches/../^};/ } @patchlevel_h;
-@local_patches = grep { !/^\s*,?NULL/ } @local_patches;
+@local_patches = grep { !/^\s*,?NULL/ && ! /,"uncommitted-changes"/ }
+ grep { /^static.*local_patches/../^};/ }
+ @patchlevel_h;
@lpatch_tags = map { /^\s*,"(\w+)/ } @local_patches;
$lpatch_tags = join "-", @lpatch_tags;