cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

tests.nixpkgs-check-by-name: Intermediate InvalidPackageName error

Browse source
This commit is contained in:
Silvan Mosberger 2023-10-20 00:33:39 +02:00
parent b011d53bda
commit e7d9cc96ed
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/test/nixpkgs-check-by-name/src/check_result.rs
View file

@ -7,6 +7,10 @@ use std::io;
use std::path::PathBuf;
pub enum CheckError {
InvalidPackageName {
relative_package_dir: PathBuf,
package_name: String,
},
IncorrectShard {
relative_package_dir: PathBuf,
correct_relative_package_dir: PathBuf,
@ -79,6 +83,12 @@ impl CheckError {
impl fmt::Display for CheckError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
CheckError::InvalidPackageName { relative_package_dir, package_name } =>
write!(
f,
"{}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".",
relative_package_dir.display(),
),
CheckError::IncorrectShard { relative_package_dir, correct_relative_package_dir } =>
write!(
f,

23
pkgs/test/nixpkgs-check-by-name/src/structure.rs
View file

@ -105,12 +105,15 @@ impl Nixpkgs {
}
let package_name_valid = PACKAGE_NAME_REGEX.is_match(&package_name);
if !package_name_valid {
error_writer.write(&format!(
"{}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".",
relative_package_dir.display(),
))?;
let name_check_result = if !package_name_valid {
CheckError::InvalidPackageName {
relative_package_dir: relative_package_dir.clone(),
package_name: package_name.clone(),
}
.into_result()
} else {
pass(())
};
let correct_relative_package_dir = Nixpkgs::relative_dir_for_package(&package_name);
let shard_check_result = if relative_package_dir != correct_relative_package_dir {
@ -144,8 +147,14 @@ impl Nixpkgs {
pass(())
};
let check_result =
flatten_check_results([shard_check_result, package_nix_check_result], |_| ());
let check_result = flatten_check_results(
[
name_check_result,
shard_check_result,
package_nix_check_result,
],
|_| (),
);
write_check_result(error_writer, check_result)?;