work on --self and restart

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

1 files changed, 9 insertions, 14 deletions

diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index d7c6039c8c3..bcf73275a1d 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -26,8 +26,8 @@ BEGIN {
     $TeXLiveServerURL
     $TeXLiveServerPath
     $TeXLiveURL
-    $WinSpecialUpdatePackagesRegexp
     @CriticalPackagesList
+    $CriticalPackagesRegexp
     @AllowedConfigOptions
     $WindowsMainMenuName
     $RelocPrefix
@@ -80,14 +80,12 @@ our $TeXLiveURL = "$TeXLiveServerURL/$TeXLiveServerPath";
 our $RelocTree = "texmf-dist";
 our $RelocPrefix = "RELOC";
 
-our $WinSpecialUpdatePackagesRegexp = 
-  '^(texlive\.infra|tlperl\.win32$)';
-
-
-
 our @CriticalPackagesList = qw/texlive.infra/;
-push(@CriticalPackagesList, "tlperl.win32") if ($^O=~/^MSWin(32|64)$/i);
-  
+our $CriticalPackagesRegexp = '^(texlive\.infra)';
+if ($^O=~/^MSWin(32|64)$/i) {
+  push(@CriticalPackagesList, "tlperl.win32");
+  $CriticalPackagesRegexp = '^(texlive\.infra|tlperl\.win32$)';
+}
 
 our @AllowedConfigOptions = qw/
   available_architectures
@@ -244,15 +242,12 @@ The defaults are respectively, C<http://mirror.ctan.org> and
 C<systems/texlive/tlnet/>I<rel>, where I<rel> specifies the TeX Live
 release version, such as C<tldev> or C<2008>.
 
-=item C<$TeXLive::TLConfig::WinSpecialUpdatePackagesRegexp>
-
-A regexp matching all those packages which cannot be normally updated 
-because they contain files which are open during the update process.
-
 =item C<@TeXLive::TLConfig::CriticalPackagesList>
+=item C<@TeXLive::TLConfig::CriticalPackagesRegexp>
 
 A list of all those packages which we do not update regularly
-since they are too central, currently only texlive.infra.
+since they are too central, currently only texlive.infra (and tlperl.win32
+for Windows).
 
 =item C<@TeXLive::TLConfig::AllowedConfigOptions>