diff options
| author | Norbert Preining <preining@logic.at> | 2013-08-06 01:50:48 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2013-08-06 01:50:48 +0000 |
| commit | 34f0ce7203836a8959ceb4ebd1e3842832cdb1d7 (patch) | |
| tree | 95b9ed8d99421bb4a93914e1575c49ec8f7e69f2 | |
| parent | cba28828bc05b30a10e4d098f57e92c3356bf965 (diff) | |
fix for installation from file
git-svn-id: svn://tug.org/texlive/trunk@31361 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 13 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 3f334b1cc1a..b034f93c39d 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -3370,6 +3370,14 @@ END_DISK_WARN sub action_install { init_local_db(1); return if !check_on_writable(); + + # + # installation from a .tar.xz + if ($opts{"file"}) { + return $localtlpdb->install_package_files(@ARGV); + } + + # if we are still here, we are installing from some repository # initialize the TLPDB from $location $opts{"no-depends"} = 1 if $opts{"no-depends-at-all"}; init_tlmedia_or_die(); @@ -3391,11 +3399,6 @@ sub action_install { } } - # - # installation from a .tar.xz - if ($opts{"file"}) { - return $localtlpdb->install_package_files(@ARGV); - } $opts{"no-depends"} = 1 if $opts{"no-depends-at-all"}; info("install: dry run, no changes will be made\n") if $opts{"dry-run"}; diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 0eeee548afc..abcbd51e599 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -1410,7 +1410,7 @@ sub install_package_files { next; } if ($reloc) { - if ($totlpdb->setting("usertree")) { + if ($self->setting("usertree")) { $tlpobj->cancel_reloc_prefix; } else { $tlpobj->replace_reloc_prefix; @@ -1431,7 +1431,7 @@ sub install_package_files { # Run the post installation code in the postaction tlpsrc entries # in case we are on w32 and the admin did install for himself only # we switch off admin mode - if (win32() && admin() && !$totlpdb->option("w32_multi_user")) { + if (win32() && admin() && !$self->option("w32_multi_user")) { non_admin(); } # for now desktop_integration maps to both installation |