more fixes for building

git-svn-id: svn://tug.org/texlive/trunk@40497 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 4 insertions, 1 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 0574f527235..b9b7f52886a 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -21,7 +21,7 @@
 
 my $svnrev = '$Revision$';
 $svnrev =~ m/: ([0-9]+) /;
-$::installerrevision = $1;
+$::installerrevision = ($1 ? $1 : 'unknown');
 
 # taken from 00texlive.config: release, $tlpdb->config_release;
 our $texlive_release;
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 9b437e3c595..635de207af7 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -388,6 +388,8 @@ sub main
   if (chdir("$opt_location/tlpkg/")) {
     xsystem("md5sum texlive.tlpdb > texlive.tlpdb.md5");
     xsystem("$TeXLive::TLConfig::ChecksumProgram texlive.tlpdb > texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
+    # remove signature, otherwise gpg breaks
+    xsystem("rm -f texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension.asc");
     # the following somehow needs to be on one line, otherwise the shell
     # expansion is strange!
     xsystem("$opt_gpgcmd texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg
index e5c7427aec2..b37397fd32e 100755
--- a/Master/tlpkg/bin/tl-update-install-pkg
+++ b/Master/tlpkg/bin/tl-update-install-pkg
@@ -240,6 +240,7 @@ sub install_files {
     copy ("$tmpdir/$f", $outputdir);
     system ("cd $outputdir && $TeXLive::TLConfig::ChecksumProgram $f >$f.$TeXLive::TLConfig::ChecksumExtension");
     # keep that on one line!
+    system ("cd $outputdir && rm -f $f.$TeXLive::TLConfig::ChecksumExtension.asc");
     system ("cd $outputdir && $opt_gpgcmd $f.$TeXLive::TLConfig::ChecksumExtension");
     system ('ls', '-l', "$outputdir/$f");
   }