update the auto-backup-feature for current tlmgr.pl

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

1 files changed, 24 insertions, 20 deletions

diff --git a/Master/tlpkg/etc/auto-backup-feature.patch b/Master/tlpkg/etc/auto-backup-feature.patch
index 51493fd227b..3aa7e818545 100644
--- a/Master/tlpkg/etc/auto-backup-feature.patch
+++ b/Master/tlpkg/etc/auto-backup-feature.patch
@@ -22,18 +22,22 @@ So if you want to set up automatic backups, do:
   tlmgr option autobackup 5
 
 TODO:
-- tlmgr backup clean
+. tlmgr backup clean
   necessary? can be done by hand. But since the code is here ...
-- testing on windows
-- documentation in POD format
-- testing with .doc/.src args, and with .ARCH packages, no idea
+. testing on windows
+. documentation in POD format
+. testing with .doc/.src args, and with .ARCH packages, no idea
   what is going on there
 
+---
+ texmf/scripts/texlive/tlmgr.pl |  141 ++++++++++++++++++++++++++++++++++++-----
+ tlpkg/TeXLive/TLPDB.pm         |    9 ++
+ 2 files changed, 136 insertions(+), 14 deletions(-)
 
-Index: texmf/scripts/texlive/tlmgr.pl
+Index: Master/texmf/scripts/texlive/tlmgr.pl
 ===================================================================
---- texmf/scripts/texlive/tlmgr.pl	(revision 11059)
-+++ texmf/scripts/texlive/tlmgr.pl	(working copy)
+--- Master.orig/texmf/scripts/texlive/tlmgr.pl	2008-10-27 23:59:04.000000000 +0100
++++ Master/texmf/scripts/texlive/tlmgr.pl	2008-10-27 23:59:10.000000000 +0100
 @@ -34,6 +34,16 @@
  #   - always do backups, let the user clean them up manually
  #   Possibly, an operation like 'tlmgr clean' for cleaning old backup could
@@ -60,7 +64,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
             "h|help|?" => \$opt_help) or pod2usage(2);
  
  my $action = shift;
-@@ -909,6 +919,7 @@
+@@ -928,6 +938,7 @@
    my $opt_list = 0;
    my $opt_noremove = 0;
    my $opt_backupdir;
@@ -68,7 +72,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
    Getopt::Long::Configure(@getopt_configure_subopts);
    GetOptions("no-depends"        => \$opt_nodepends,
               "no-depends-at-all" => \$opt_reallynodepends,
-@@ -916,6 +927,7 @@
+@@ -935,6 +946,7 @@
               "list"              => \$opt_list,
               "no-remove"         => \$opt_noremove,
               "backupdir=s"       => \$opt_backupdir,
@@ -76,7 +80,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
               "n|dry-run"         => \$opt_dry) or pod2usage(2);
    $opt_nodepends = 1 if $opt_reallynodepends;
    my $nrupdated = 0;
-@@ -925,6 +937,70 @@
+@@ -944,6 +956,70 @@
    my $mediatlpdb = $tlmediasrc->tlpdb;
    info("update: dry run, no changes will be made\n") if $opt_dry;
  
@@ -147,7 +151,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
    # these two variables are used throughout this function
    my $root = $localtlpdb->root;
    my $temp = "$root/temp";
-@@ -1103,19 +1179,18 @@
+@@ -1122,19 +1198,18 @@
        if ($opt_list) {
          info("$pkg: local: $rev, source: $mediarev\n");
        } else {
@@ -175,9 +179,9 @@ Index: texmf/scripts/texlive/tlmgr.pl
          }
 +
          if (win32() && ($pkg =~ m/$WinSpecialUpdatePackagesRegexp/)) {
-           add_win32_updater($mediatlp, $opt_dry);
+           add_w32_updater($mediatlp, $opt_dry);
          } else {
-@@ -1142,6 +1217,10 @@
+@@ -1161,6 +1236,10 @@
              $remove_unwind_container = 1;
              $unwind_package = "$fullname";
            }
@@ -188,16 +192,16 @@ Index: texmf/scripts/texlive/tlmgr.pl
            # the remove_package should also remove empty dirs in case
            # a dir is changed into a file
            merge_into(\%ret, &remove_package($pkg, $localtlpdb, 1));
-@@ -1157,7 +1236,7 @@
+@@ -1176,7 +1255,7 @@
              # dirs from the new package before re-installing the old one.
              # TODO
              logpackage("failed update: $pkg ($rev -> $mediarev)");
 -            tlwarn("\n\nInstallation of new version of $pkg did fail, trying to unwind!\n");
 +            tlwarn("\n\nInstallation of new version of $pkg did fail, trying to unwind.\n");
              if (win32()) {
-               # win32 is notorious for not releasing a file immediately
+               # w32 is notorious for not releasing a file immediately
                # we experienced permission denied errors 
-@@ -1383,7 +1462,15 @@
+@@ -1402,7 +1481,15 @@
      print "Install documentation files:    ", ($localtlpdb->option_install_docfiles ? "yes": "no"), "\n";
      print "Install source files:           ", ($localtlpdb->option_install_srcfiles ? "yes": "no"), "\n";
    } else {
@@ -214,7 +218,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
    }
    return;
  }
-@@ -1937,6 +2024,32 @@
+@@ -1961,6 +2048,32 @@
  }
  
  
@@ -247,10 +251,10 @@ Index: texmf/scripts/texlive/tlmgr.pl
  #
  # return all the directories from which all content will be removed
  #
-Index: tlpkg/TeXLive/TLPDB.pm
+Index: Master/tlpkg/TeXLive/TLPDB.pm
 ===================================================================
---- tlpkg/TeXLive/TLPDB.pm	(revision 11059)
-+++ tlpkg/TeXLive/TLPDB.pm	(working copy)
+--- Master.orig/tlpkg/TeXLive/TLPDB.pm	2008-10-27 23:58:53.000000000 +0100
++++ Master/tlpkg/TeXLive/TLPDB.pm	2008-10-27 23:59:10.000000000 +0100
 @@ -49,6 +49,7 @@
    $tlpdb->config_container_format;
    $tlpdb->config_release;