2 files changed, 23 insertions, 11 deletions
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 3a941a6d290..3d0e226b0e9 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -138,11 +138,11 @@ MAKETAR ()
 
   cd $master
   do_tar $NAME-$D-extra LICENSE* README* *.html install* re* \
-         tl-portable* tlpkg/TeXLive tlpkg/translations \
-  do_tar $NAME-$D-texmf texmf*
+         tl-portable* tlpkg/TeXLive tlpkg/translations || return
+  do_tar $NAME-$D-texmf texmf* || return
 
   cd $master/../Build/source
-  do_tar $NAME-$D-source *
+  do_tar $NAME-$D-source * || return
 
   cd $master/bin
   do_tar $NAME-$D-bin *
@@ -154,7 +154,7 @@ MAKETAR ()
 # Add our exact version to the release file.
 printf "\ntexlive-$D\n" >>$master/release-texlive.txt
 
-#$maketar && MAKETAR
+$maketar && MAKETAR
 $makelive && MAKELIVE
 
 # Undo the version.
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index ae7858591b4..b538ac90a2a 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -163,14 +163,26 @@ if test -n "$unexpected_output"; then
   echo "$0: Test installation failed." >&2
   echo "$0: Here is the unexpected output:" >&2
   echo "$unexpected_output" >&2
+fi
 
-else
-  # install worked, how about tlmgr?
-  tlmgr=$tltryinst/$yyyy/bin/*/tlmgr
-  if $tlmgr update --list; then :; else
-    failure=true
-    echo "$0: tlmgr update --list failed ($tlmgr)." >&2
-   fi
+# more consistency checks.
+if test $failure = false; then
+  for cmd in \
+      "$tltryinst/$yyyy/bin/*/tlmgr update --list" \
+      "$Master/tlpkg/bin/check-tlnet-consistency --location=$tlnet_dir" \
+      "$Master/tlpkg/bin/tl-compare-tlpdbs $tlnet_dir/tlpkg/texlive.tlpdb" \
+  ; do
+    basecmd=`basename $cmd`
+    echo "$0: Running $basecmd ($cmd)"
+    outfile=/tmp/tlcheck.`echo "$cmd" | awk '{print $1}'`
+    if $cmd >$outfile 2>&1; then :; else
+      echo "$0: $basecmd failed ($cmd):" >&2
+      sed 8q $outfile >&2
+      echo "... see $outfile for full output ..." >&2
+      echo >&2
+      failure=true
+    fi
+  done
 fi
 
 if $failure; then