From bb7887e390e940be5531e044b9ce09ffd56ec442 Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Wed, 3 Jul 2024 14:49:43 +0200
Subject: [PATCH] ReadPackage now raises a warning if file is missing / cannot
 be read

---
 lib/package.gd |  3 ++-
 lib/package.gi | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/package.gd b/lib/package.gd
index 178624c024..e847396a6e 100644
--- a/lib/package.gd
+++ b/lib/package.gd
@@ -688,7 +688,8 @@ DeclareGlobalFunction( "DirectoriesPackageLibrary" );
 ##  package to be loaded.)
 ##  <P/>
 ##  If the file is readable then <K>true</K> is returned,
-##  otherwise <K>false</K>.
+##  otherwise a warning is displayed (for <Ref Func="ReadPackage"/>)
+##  or <K>false</K> is returned (for <Ref Func="RereadPackage"/>).
 ##  <P/>
 ##  Each of <A>name</A> and <A>file</A> should be a string.
 ##  The <A>name</A> argument is case insensitive.
diff --git a/lib/package.gi b/lib/package.gi
index 226dba4014..5b59cfe437 100644
--- a/lib/package.gi
+++ b/lib/package.gi
@@ -1316,7 +1316,7 @@ end );
 #F  ReadPackage( [<name>, ]<file> )
 #F  RereadPackage( [<name>, ]<file> )
 ##
-InstallGlobalFunction( ReadPackage, function( arg )
+BindGlobal( "_ReadPackage", function( arg, error )
     local pos, relpath, pkgname, namespace, filename;
 
     # Note that we cannot use `ReadAndCheckFunc' because this calls
@@ -1329,16 +1329,16 @@ InstallGlobalFunction( ReadPackage, function( arg )
       if pos = fail then
         ErrorNoReturn(arg[1], " is not a filename in the form 'package/filepath'");
       fi;
+      pkgname:= arg[1]{ [ 1 .. pos-1 ] };
       relpath:= arg[1]{ [ pos+1 .. Length( arg[1] ) ] };
-      pkgname:= LowercaseString( arg[1]{ [ 1 .. pos-1 ] } );
-      namespace := GAPInfo.PackagesInfo.(pkgname)[1].PackageName;
     elif Length( arg ) = 2 then
-      pkgname:= LowercaseString( arg[1] );
-      namespace := GAPInfo.PackagesInfo.(pkgname)[1].PackageName;
+      pkgname:= arg[1];
       relpath:= arg[2];
     else
       Error( "expected 1 or 2 arguments" );
     fi;
+    pkgname:= LowercaseString( pkgname );
+    namespace := GAPInfo.PackagesInfo.(pkgname)[1].PackageName;
 
     # Note that `DirectoriesPackageLibrary' finds the file relative to the
     # installation path of the info record chosen in `LoadPackage'.
@@ -1348,9 +1348,14 @@ InstallGlobalFunction( ReadPackage, function( arg )
       Read( filename );
       LEAVE_NAMESPACE();
       return true;
-    else
-      return false;
+    elif error then
+      Info(InfoWarning, 1, "ReadPackage could not read <", pkgname, ">/", relpath, "\n");
     fi;
+    return false;
+    end );
+
+InstallGlobalFunction( ReadPackage, function( arg )
+    return _ReadPackage( arg, true );
     end );
 
 InstallGlobalFunction( RereadPackage, function( arg )
@@ -1359,7 +1364,7 @@ InstallGlobalFunction( RereadPackage, function( arg )
     MakeReadWriteGlobal( "REREADING" );
     REREADING:= true;
     MakeReadOnlyGlobal( "REREADING" );
-    res:= CallFuncList( ReadPackage, arg );
+    res:= _ReadPackage( arg, false );
     MakeReadWriteGlobal( "REREADING" );
     REREADING:= false;
     MakeReadOnlyGlobal( "REREADING" );