summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLUtils.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2023-09-15 13:11:11 +0000
committerNorbert Preining <preining@logic.at>2023-09-15 13:11:11 +0000
commit918dc82333976a755c079a3e7e092613f73ade18 (patch)
treefe252dd4a9159e5b0b1f3e34f19eb8e74e9ab68e /Master/tlpkg/TeXLive/TLUtils.pm
parent6701ce2c59ac18347d73a7252042ae9ba58ab082 (diff)
tlmgr: on update test that we can remove files (deal with ro dirs)
git-svn-id: svn://tug.org/texlive/trunk@68283 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm73
1 files changed, 52 insertions, 21 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index cc4d49f1ecc..69566bc33b2 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -59,6 +59,8 @@ C<TeXLive::TLUtils> - TeX Live infrastructure miscellany
TeXLive::TLUtils::copy($file, $target_dir);
TeXLive::TLUtils::touch(@files);
TeXLive::TLUtils::collapse_dirs(@files);
+ TeXLive::TLUtils::all_dirs_and_removed_dirs(@files);
+ TeXLive::TLUtils::dirs_of_files(@files);
TeXLive::TLUtils::removed_dirs(@files);
TeXLive::TLUtils::download_file($path, $destination);
TeXLive::TLUtils::setup_programs($bindir, $platform);
@@ -210,6 +212,8 @@ BEGIN {
&copy
&touch
&collapse_dirs
+ &all_dirs_and_removed_dirs
+ &dirs_of_files
&removed_dirs
&install_package
&install_packages
@@ -1614,30 +1618,14 @@ sub collapse_dirs {
return @ret;
}
-=item C<removed_dirs(@files)>
-
-Returns all the directories from which all content will be removed.
-
-Here is the idea:
-
-=over 4
-
-=item create a hashes by_dir listing all files that should be removed
- by directory, i.e., key = dir, value is list of files
-
-=item for each of the dirs (keys of by_dir and ordered deepest first)
- check that all actually contained files are removed
- and all the contained dirs are in the removal list. If this is the
- case put that directory into the removal list
-
-=item return this removal list
+=item C<dirs_of_files(@files)>
-=back
+Returns all the directories in which at least one of the given
+files reside.
=cut
-sub removed_dirs {
+sub dirs_of_files {
my (@files) = @_;
- my %removed_dirs;
my %by_dir;
# construct hash of all directories mentioned, values are lists of the
@@ -1663,6 +1651,21 @@ sub removed_dirs {
$by_dir{$d} = \@a;
}
+ return %by_dir;
+}
+
+=item C<all_dirs_and_removed_dirs(@files)>
+
+Returns all the directories for files and those from which all
+content will be removed.
+
+=cut
+
+sub all_dirs_and_removed_dirs {
+ my (@files) = @_;
+ my %removed_dirs;
+ my %by_dir = dirs_of_files(@files);
+
# for each of our directories, see if we are removing everything in
# the directory. if so, return the directory; else return the
# individual files.
@@ -1698,9 +1701,37 @@ sub removed_dirs {
$removed_dirs{$d} = 1;
}
}
+ return (%by_dir, %removed_dirs);
+}
+
+=item C<removed_dirs(@files)>
+
+Returns all the directories from which all content will be removed.
+
+Here is the idea:
+
+=over 4
+
+=item create a hashes by_dir listing all files that should be removed
+ by directory, i.e., key = dir, value is list of files
+
+=item for each of the dirs (keys of by_dir and ordered deepest first)
+ check that all actually contained files are removed
+ and all the contained dirs are in the removal list. If this is the
+ case put that directory into the removal list
+
+=item return this removal list
+
+=back
+=cut
+
+sub removed_dirs {
+ my (@files) = @_;
+ my (%by_dir, %removed_dirs) = all_dirs_and_removed_dirs(@files);
return keys %removed_dirs;
}
+
=item C<time_estimate($totalsize, $donesize, $starttime)>
Returns the current running time and the estimated total time
@@ -5275,4 +5306,4 @@ GNU General Public License Version 2 or later.
### tab-width: 2
### indent-tabs-mode: nil
### End:
-# vim:set tabstop=2 expandtab: #
+# vim:set tabstop=2 shiftwidth=2 expandtab: #