Announce-gen assumes that there are *.tar.bz2 and xdelta files, libidn
doesn't use either. This patch disables printing information for
those files, when the files doesn't exist. An alternate solution
would be to warn instead, but I think it is nicer to always output a
complete announcement from the available resources without any
additional noise. What do you think?
/Simon
--- announce-gen 28 Dec 2006 19:11:54 +0100 1.5
+++ announce-gen 28 Dec 2006 19:40:51 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# Generate a release announcement message.
-my $VERSION = '2006-12-08 17:35'; # UTC
+my $VERSION = '2006-12-28 18:40'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -122,6 +122,7 @@
my %res;
foreach my $f (@file)
{
+ next if !$f;
my $cmd = "du --human $f";
my $t = `$cmd`;
# FIXME-someday: give a better diagnostic, a la $PROCESS_STATUS
@@ -149,6 +150,7 @@
{
for my $file (@file)
{
+ next if !$file;
print " $url/$file";
print " (", $$size{$file}, ")"
if exists $$size{$file};
@@ -175,6 +177,7 @@
{
foreach my $f (@file)
{
+ next if !$f;
open IN, '<', $f
or die "$ME: $f: cannot open for reading: $!\n";
binmode IN;
@@ -428,6 +431,9 @@
my $tbz = "$my_distdir.tar.bz2";
my $xd = "$package_name-$prev_version-$curr_version.xdelta";
+ $tbz = "" if (! -f $tbz);
+ $xd = "" if (! -f $xd);
+
my %size = sizes ($tgz, $tbz, $xd);
%size
or exit 1;
@@ -447,9 +453,9 @@
print_locations ("compressed sources", @url_dir_list, %size,
$tgz, $tbz);
print_locations ("xdelta-style diffs", @url_dir_list, %size,
- $xd);
+ $xd) if $xd;
print_locations ("GPG detached signatures[*]", @url_dir_list, %size,
- "$tgz.sig", "$tbz.sig");
+ "$tgz.sig", $tbz ? "$tbz.sig" : "");
print_checksums ($tgz, $tbz, $xd);
