Fix my lazy IO mistake

[p5sagit/Distar.git] / lib / Distar.pm

diff --git a/lib/Distar.pm b/lib/Distar.pm
index 2d02338..df7fb8f 100644 (file)
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -4,6 +4,7 @@ use strictures 1;
 use base qw(Exporter);
 
 use Config;
+use File::Spec;
 
 our @EXPORT = qw(
   author manifest_include run_preflight
@@ -59,18 +60,19 @@ sub run_preflight {
   system("git fetch");
 
   my $make = $Config{make};
+  my $null = File::Spec->devnull;
 
-  for (scalar `"$make" manifest 2>&1 >/dev/null`) {
+  for (scalar `"$make" manifest 2>&1 >$null`) {
     $_ && die "$make manifest changed:\n$_ Go check it and retry";
   }
 
   for (scalar `git status`) {
     /^# On branch master/ || die "Not on master. EEEK";
-    /Your branch is (behind|ahead of)/ && die "Not synced with upstream";
+    /Your branch is behind|Your branch and .*? have diverged/ && die "Not synced with upstream";
   }
 
   for (scalar `git diff`) {
-    length && die "Oustanding changes";
+    length && die "Outstanding changes";
   }
   my $ymd = sprintf(
     "%i-%02i-%02i", (localtime)[5]+1900, (localtime)[4]+1, (localtime)[3]
@@ -78,11 +80,12 @@ sub run_preflight {
   my @cached = grep /^\+/, `git diff --cached -U0`;
   @cached > 0 or die "Please add:\n\n$ARGV[0] - $ymd\n\nto Changes and git add";
   @cached == 2 or die "Pre-commit Changes not just Changes line";
-  $cached[0] eq "+++ b/Changes\n" or die "Changes not changed";
+  $cached[0] =~ /^\+\+\+ .\/Changes\n/ or die "Changes not changed";
   $cached[1] eq "+$ARGV[0] - $ymd\n" or die "Changes new line should be: \n\n$ARGV[0] - $ymd\n ";
 }
 
-sub MY::postamble { <<'END'; }
+sub MY::postamble {
+    my $post = <<'END';
 preflight:
        perl -IDistar/lib -MDistar -erun_preflight $(VERSION)
 release: preflight
@@ -97,9 +100,13 @@ release: preflight
 distdir: readmefile
 readmefile: create_distdir
        pod2text $(VERSION_FROM) >$(DISTVNAME)/README
-       $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'eval { maniadd({q{README} => q{README file (added by Distar)}}) } ' \
-         -e '    or print "Could not add README to MANIFEST: $${'\''@'\''}\n"' --
+       $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-readme-to-manifest
 END
+    if (open my $fh, '<', 'maint/Makefile.include') {
+        $post .= do { local $/; <$fh> };
+    }
+    return $post;
+}
 
 {
   no warnings 'redefine';