Skip to content

Commit

Permalink
Allow longer lines for info warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mtorpey committed Sep 9, 2024
1 parent 49b40cc commit 963728e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 26 deletions.
3 changes: 1 addition & 2 deletions gap/archive.gi
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ function(url)
files := SplitString(exec.output, "", "\n");
topdir := Set(files, f -> SplitString(f, "/")[1]);
if Length(topdir) <> 1 then
Info(InfoPackageManager, 1,
"Archive should contain 1 directory (not ", Length(topdir), ")");
Info(InfoPackageManager, 1, "Archive should contain 1 directory (not ", Length(topdir), ")");
return false;
fi;
topdir := topdir[1];
Expand Down
3 changes: 1 addition & 2 deletions gap/compile.gd
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@ DeclareGlobalFunction("CompilePackage");
DeclareGlobalFunction("PKGMAN_CompileDir");

PKGMAN_BuildPackagesScript :=
Filename(DirectoriesPackageLibrary("PackageManager", "etc"),
"BuildPackages.sh");
Filename(DirectoriesPackageLibrary("PackageManager", "etc"), "BuildPackages.sh");
9 changes: 3 additions & 6 deletions gap/compile.gi
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ function(dir)
# Note: this is mainly for installing Semigroups from GitHub
prerequisites := Filename(Directory(dir), "prerequisites.sh");
if IsReadableFile(prerequisites) then
Info(InfoPackageManager, 3,
"Running prerequisites.sh for ", info.PackageName, "...");
Info(InfoPackageManager, 3, "Running prerequisites.sh for ", info.PackageName, "...");
exec := PKGMAN_Exec(dir, prerequisites);
fi;

Expand All @@ -60,10 +59,8 @@ function(dir)
if exec = fail or
exec.code <> 0 or
PositionSublist(exec.output, "Failed to build") <> fail then
Info(InfoPackageManager, 1,
"Compilation failed for package '",
info.PackageName,
"' (package may still be usable)");
Info(InfoPackageManager, 1, "Compilation failed for package '", info.PackageName, "'");
Info(InfoPackageManager, 1, "(package may still be usable)");
Info(InfoPackageManager, 2, exec.output);
return false;
else
Expand Down
3 changes: 1 addition & 2 deletions gap/directories.gi
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ function(dir)
return false;
elif Length(DirectoryContents(dir)) > 2 then
Info(InfoPackageManager, 1, "Package already installed at target location");
Info(InfoPackageManager, 2,
"Target directory ", dir, " exists and is non-empty");
Info(InfoPackageManager, 2, "Target directory ", dir, " exists and is non-empty");
return false;
fi;
return true;
Expand Down
20 changes: 7 additions & 13 deletions gap/distro.gi
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ function(name, args...)
# An info message has already been printed.
return false;
elif not IsBound(urls.(name)) then
Info(InfoPackageManager, 1,
"Package \"", name, "\" not found in package list");
Info(InfoPackageManager, 1, "Package \"", name, "\" not found in package list");
return false;
fi;

Expand All @@ -49,8 +48,7 @@ function(name, args...)
current := info[1]; # Highest-priority installation in user pkg directory
if version <> true and
CompareVersionNumbers(current.Version, version) then
Info(InfoPackageManager, 2, "Version ", current.Version,
" of package \"", name, "\" is already installed");
Info(InfoPackageManager, 2, "Version ", current.Version, " of package \"", name, "\" is already installed");
return PKGMAN_CheckPackage(current.InstallationPath);
fi;

Expand All @@ -75,20 +73,16 @@ function(name, args...)
# Updating to the newest version will satisfy the version condition.
return UpdatePackage(name, interactive);
else
Info(InfoPackageManager, 1, "Version \"", version, "\" of package \"",
name, "\" cannot be satisfied");
Info(InfoPackageManager, 2,
"The newest version available is ", newest.Version);
Info(InfoPackageManager, 1, "Version \"", version, "\" of package \"", name, "\" cannot be satisfied");
Info(InfoPackageManager, 2, "The newest version available is ", newest.Version);
return false;
fi;
elif CompareVersionNumbers(newest.Version, current.Version, "equal") then
Info(InfoPackageManager, 2, "The newest version of package \"", name,
"\" is already installed");
Info(InfoPackageManager, 2, "The newest version of package \"", name, "\" is already installed");
return PKGMAN_CheckPackage(current.InstallationPath);
elif CompareVersionNumbers(newest.Version, current.Version) then
q := Concatenation("Package \"", name, "\" version ", current.Version,
" is installed, but ", newest.Version,
" is available. Install it?");
q := "Package '{}' version '{}' is installed, but '{}' is available. Install it?";
q := StringFormatted(q, name, current.Version, newest.Version);
if interactive and PKGMAN_AskYesNoQuestion(q : default := false) then
return UpdatePackage(name, interactive);
else
Expand Down
3 changes: 2 additions & 1 deletion tst/compile.tst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ gap> GAPInfo.DirectoriesPrograms := [];; # terrible vandalism
gap> dir := PackageInfo("example")[1].InstallationPath;;
gap> PKGMAN_CompileDir(dir);
#I No shell available called "sh"
#I Compilation failed for package 'Example' (package may still be usable)
#I Compilation failed for package 'Example'
#I (package may still be usable)
false
gap> GAPInfo.DirectoriesPrograms := progs;;

Expand Down

0 comments on commit 963728e

Please sign in to comment.