This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 8a8a89767fbde80f05097e0fc75891678413fe2a Author: James McCoy <[email protected]> Date: Mon Apr 21 10:20:17 2014 -0400 mk-origtargz: Change uscan_die calls to die Signed-off-by: James McCoy <[email protected]> --- scripts/mk-origtargz.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl index 45a5b15..c892f57 100755 --- a/scripts/mk-origtargz.pl +++ b/scripts/mk-origtargz.pl @@ -283,7 +283,7 @@ for my $copyright_file (@copyright_files) { undef $data; }; if (not -e $copyright_file) { - uscan_die ("File $copyright_file not found."); + die "File $copyright_file not found."; } elsif ( $data && defined $data->{'format'} && $data->{'format'} =~ m{^$okformat/?$}) @@ -364,15 +364,15 @@ if ($is_zipfile) { my $tempdir = tempdir ("uscanXXXX", TMPDIR => 1, CLEANUP => 1); # Parent of the target directory should be under our control $tempdir .= '/repack'; - mkdir $tempdir or uscan_die("Unable to mkdir($tempdir): $!\n"); + mkdir $tempdir or die("Unable to mkdir($tempdir): $!\n"); system('unzip', '-q', '-a', '-d', $tempdir, $upstream_tar) == 0 - or uscan_die("Repacking from zip or jar failed (could not unzip)\n"); + or die("Repacking from zip or jar failed (could not unzip)\n"); # Figure out the top-level contents of the tarball. # If we'd pass "." to tar we'd get the same contents, but the filenames would # start with ./, which is confusing later. # This should also be more reliable than, say, changing directories and globbing. - opendir(TMPDIR, $tempdir) || uscan_die("Can't open $tempdir $!\n"); + opendir(TMPDIR, $tempdir) || die("Can't open $tempdir $!\n"); my @files = grep {$_ ne "." && $_ ne ".."} readdir(TMPDIR); close TMPDIR; @@ -384,7 +384,7 @@ if ($is_zipfile) { @files], wait_child => 1); unless (-e "$destfiletar") { - uscan_die("Repacking from zip or jar to tar.$suffix failed (could not create tarball)\n"); + die("Repacking from zip or jar to tar.$suffix failed (could not create tarball)\n"); } compress_archive($destfiletar, $destfile, $compression); @@ -406,7 +406,7 @@ my $do_repack = 0; if ($repack) { my $comp = compression_guess_from_file($upstream_tar); unless ($comp) { - uscan_die("Cannot determine compression method of $upstream_tar"); + die("Cannot determine compression method of $upstream_tar"); } $do_repack = $comp ne $compression; @@ -514,7 +514,7 @@ sub decompress_archive($$) { my ($from_file, $to_file) = @_; my $comp = compression_guess_from_file($from_file); unless ($comp) { - uscan_die("Cannot determine compression method of $from_file"); + die("Cannot determine compression method of $from_file"); } my $cmd = compression_get_property($comp, 'decomp_prog'); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
