diff options
Diffstat (limited to 'Master/tlpkg')
| -rw-r--r-- | Master/tlpkg/etc/dev.permutable-arguments.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Master/tlpkg/etc/dev.permutable-arguments.patch b/Master/tlpkg/etc/dev.permutable-arguments.patch index 02c188a415e..4cf30b37b53 100644 --- a/Master/tlpkg/etc/dev.permutable-arguments.patch +++ b/Master/tlpkg/etc/dev.permutable-arguments.patch @@ -206,7 +206,7 @@ Index: tlmgr2.pl my $packagelogged = 0; # how many msgs we logged chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`); -my $packagelogfile ||= "$texmfsysvar/web2c/tlmgr.log"; -+my $packagelogfile = $opts{"package-logfile"} ++my $packagelogfile = $opts{"package-logfile"}; +$packagelogfile ||= "$texmfsysvar/web2c/tlmgr.log"; # # Try to open the packagelog file, but do NOT die when that does not work @@ -395,7 +395,7 @@ Index: tlmgr2.pl + my $ob = abs_path($opts{"backupdir"}); + $ob && ($opts{"backupdir"} = $ob); + if (! -d $opts{"backupdir"}) { -+ tlwarn ("backupdir argument $opts{"backupdir"} is not a directory.\n"); ++ tlwarn ("backupdir argument $opts{'backupdir'} is not a directory.\n"); tlwarn ("Don't know from where to restore backups, terminating.\n"); exit 1; } @@ -416,7 +416,7 @@ Index: tlmgr2.pl + my $ob = abs_path($opts{"backupdir"}); + $ob && ($opts{"backupdir"} = $ob); + if (! -d $opts{"backupdir"}) { -+ tlwarn ("backupdir as set in tlpdb $opts{"backupdir"} is not a directory.\n"); ++ tlwarn ("backupdir as set in tlpdb $opts{'backupdir'} is not a directory.\n"); tlwarn ("Don't know from where to restore backups, terminating.\n"); exit 1; } @@ -428,10 +428,10 @@ Index: tlmgr2.pl # initialize the hash(packages) of hash(revisions) my %backups; - opendir (DIR, $opt_backupdir) || die "opendir($opt_backupdir) failed: $!"; -+ opendir (DIR, $opts{"backupdir"}) || die "opendir($opts{"backupdir"}) failed: $!"; ++ opendir (DIR, $opts{"backupdir"}) || die "opendir($opts{'backupdir'}) failed: $!"; my @dirents = readdir (DIR); - closedir (DIR) || warn "closedir($opt_backupdir) failed: $!"; -+ closedir (DIR) || warn "closedir($opts{"backupdir"}) failed: $!"; ++ closedir (DIR) || warn "closedir($opts{'backupdir'}) failed: $!"; for my $dirent (@dirents) { next if (-d $dirent); next if ($dirent !~ m/^(.*)\.r([0-9]+)\.tar\.lzma$/); @@ -440,7 +440,7 @@ Index: tlmgr2.pl } } else { - print "No backups available in $opt_backupdir\n"; -+ print "No backups available in $opts{"backupdir"}\n"; ++ print "No backups available in $opts{'backupdir'}\n"; } finish(0); } @@ -459,7 +459,7 @@ Index: tlmgr2.pl } - print "Restoring $pkg, $rev from $opt_backupdir/${pkg}.r${rev}.tar.lzma\n"; - if (!$opt_dry) { -+ print "Restoring $pkg, $rev from $opts{"backupdir"}/${pkg}.r${rev}.tar.lzma\n"; ++ print "Restoring $pkg, $rev from $opts{'backupdir'}/${pkg}.r${rev}.tar.lzma\n"; + if (!$opts{"dry"}) { init_local_db(1); # first remove the package, then reinstall it @@ -468,7 +468,7 @@ Index: tlmgr2.pl + $opts{"backupdir"} = abs_path($opts{"backupdir"}); merge_into(\%ret, &remove_package($pkg, $localtlpdb)); - TeXLive::TLMedia->_install_package("$opt_backupdir/${pkg}.r${rev}.tar.lzma" , [] ,$localtlpdb); -+ TeXLive::TLMedia->_install_package("$opts{"backupdir"}/${pkg}.r${rev}.tar.lzma" , [] ,$localtlpdb); ++ TeXLive::TLMedia->_install_package("$opts{'backupdir'}/${pkg}.r${rev}.tar.lzma" , [] ,$localtlpdb); logpackage("restore: $pkg ($rev)"); # now we have to read the .tlpobj file and add it to the DB my $tlpobj = TeXLive::TLPOBJ->new; @@ -477,7 +477,7 @@ Index: tlmgr2.pl } } else { - print "revision $rev for $pkg is not present in $opt_backupdir\n"; -+ print "revision $rev for $pkg is not present in $opts{"backupdir"}\n"; ++ print "revision $rev for $pkg is not present in $opts{'backupdir'}\n"; } return \%ret; } @@ -552,7 +552,7 @@ Index: tlmgr2.pl + my $ob = abs_path($opts{"backupdir"}); + $ob && ($opts{"backupdir"} = $ob); + if (! -d $opts{"backupdir"}) { -+ tlwarn ("backupdir argument $opts{"backupdir"} is not a directory.\n"); ++ tlwarn ("backupdir argument $opts{'backupdir'} is not a directory.\n"); if ($clean_mode) { tlwarn ("Cannot clean a non existing directory, terminating.\n"); } else { @@ -578,7 +578,7 @@ Index: tlmgr2.pl + my $ob = abs_path($opts{"backupdir"}); + $ob && ($opts{"backupdir"} = $ob); + if (! -d $opts{"backupdir"}) { -+ tlwarn ("backupdir as set in tlpdb $opts{"backupdir"} is not a directory.\n"); ++ tlwarn ("backupdir as set in tlpdb $opts{'backupdir'} is not a directory.\n"); if ($clean_mode) { tlwarn ("Cannot clean a non existing directory, terminating.\n"); } else { @@ -600,7 +600,7 @@ Index: tlmgr2.pl } else { my $tlp = $localtlpdb->get_package($pkg); - info("saving current status of $pkg to $opt_backupdir${pkg}.r" . -+ info("saving current status of $pkg to $opts{"backupdir"}${pkg}.r" . ++ info("saving current status of $pkg to $opts{'backupdir'}${pkg}.r" . $tlp->revision . ".\n"); - if (!$opt_dry) { + if (!$opts{"dry-run"}) { @@ -756,7 +756,7 @@ Index: tlmgr2.pl + $opts{"backup"} = 1 if $opts{"backupdir"}; - debug("Doing backups to $opt_backupdir\n") if $opt_backup; -+ debug("Doing backups to $opts{"backupdir"}\n") if $opts{"backup"}; ++ debug("Doing backups to $opts{'backupdir'}\n") if $opts{"backup"}; # these two variables are used throughout this function my $root = $localtlpdb->root; @@ -842,7 +842,7 @@ Index: tlmgr2.pl + $opts{"backupdir"}, "${pkg}.r" . $tlp->revision); $unwind_package = - "$opt_backupdir/${pkg}.r" . $tlp->revision . ".tar.lzma"; -+ "$opts{"backupdir"}/${pkg}.r" . $tlp->revision . ".tar.lzma"; ++ "$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.lzma"; if ($autobackup) { # in case we do auto backups we remove older backups |