checksum rework

- die in tlchecksum if no checksum is defined
- make sure that we call tlchecksum in TLPOBJ::make_container
  only if it is a system container (for some tlnet - not a
  backup one), or there is a checksum method defined
- make sure that we don't call tlchecksum in tlmgr when making
  a container

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

1 files changed, 9 insertions, 2 deletions

diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 5830be6ae9a..91a06c32a29 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -602,8 +602,9 @@ sub make_container {
   # overflow standard tar format and result in special things being
   # done.  We don't want the GNU-specific special things.
   #
+  my $is_sys_container = ( $containername =~ /\.r[0-9]/ );
   my @attrs
-    = $containername =~ /\.r[0-9]/
+    = $is_sys_container
       ? ()
       : ( "--owner", "0",  "--group", "0",  "--exclude", ".svn",
           "--format", "ustar" );
@@ -683,7 +684,13 @@ sub make_container {
     return (0, 0, "");
   }
   my $size = (stat "$destdir/$containername") [7];
-  my $checksum = TeXLive::TLCrypto::tlchecksum("$destdir/$containername");
+  #
+  # if we are creating a system container, or there is a way to
+  # compute the checksums, do it
+  my $checksum = "";
+  if ($is_sys_container || $::checksum_method) {
+    $checksum = TeXLive::TLCrypto::tlchecksum("$destdir/$containername");
+  }
   
   # cleaning up
   unlink("$tlpobjdir/$self->{'name'}.tlpobj");