summaryrefslogtreecommitdiff
path: root/support/pkgcheck/src/main.rs
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-12-13 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2019-12-13 03:00:58 +0000
commitfdd3c58e8e5b37dcf9affd49326899988992c074 (patch)
treeaa8c48c62e863ef5d009eaf03fc5b66b9b6888ec /support/pkgcheck/src/main.rs
parent867fe7fec2734700356f0f80dbfcad265a6e4e54 (diff)
CTAN sync 201912130300
Diffstat (limited to 'support/pkgcheck/src/main.rs')
-rw-r--r--support/pkgcheck/src/main.rs20
1 files changed, 16 insertions, 4 deletions
diff --git a/support/pkgcheck/src/main.rs b/support/pkgcheck/src/main.rs
index c69423252d..6fb4136f91 100644
--- a/support/pkgcheck/src/main.rs
+++ b/support/pkgcheck/src/main.rs
@@ -587,13 +587,21 @@ fn check_tds_archive(
// which yields a false test when checking for the package name
// the path names of the TDS zip archive files.
// Therefore, we correct here.
- let real_pkg_name = if pkg_name == "babel-base" {
- "babel"
+ // latex-tools, latex-graphics, latex-amsmath, latex-base => latex
+ //let mut pkg_replacements: HashMap<String,String> = HashMap::default();
+ //pkg_replacements.insert("babel-base".to_string(), "babel".to_string());
+ let mut pkg_replacements: HashMap<&str,&str> = HashMap::default();
+ pkg_replacements.insert("babel-base", "babel");
+ pkg_replacements.insert("latex-base", "latex");
+ pkg_replacements.insert("latex-tools", "latex");
+ pkg_replacements.insert("latex-graphics", "latex");
+ pkg_replacements.insert("latex-amsmath", "latex");
+ let real_pkg_name = if let Some(real_name) = pkg_replacements.get(pkg_name) {
+ real_name
} else {
pkg_name
};
-
let tmp_dir = TempDir::new("pkgcheck")?;
let tmp_dir_offset = tmp_dir.path().to_str().unwrap().len() + 1;
unzip_tds_archive(tds_zip, tmp_dir.path().to_str().unwrap());
@@ -1180,7 +1188,11 @@ fn check_package(root: &str, tds_zip: &Option<String>) -> Option<Hashes> {
}
filemagic::Mimetype::Archive | filemagic::Mimetype::Zip => {
- w0001!(dir_entry_str);
+ if dir_entry_str.ends_with(".tds.zip") {
+ e0035!(dir_entry_str);
+ } else {
+ w0001!(dir_entry_str);
+ }
check_and_correct_perms(dir_entry_str, p);
}