WIP

Author: fingolfin

lib/package.gi

@@ -1862,19 +1862,19 @@ InstallGlobalFunction( SetPackagePath, function( pkgname, pkgpath )
 #F  ExtendRootDirectories( <paths> )
 ##
 InstallGlobalFunction( ExtendRootDirectories, function( rootpaths )
-    local i;
-
-    rootpaths:= Filtered( rootpaths, path -> not path in GAPInfo.RootPaths );
-    if not IsEmpty( rootpaths ) then
-      # 'DirectoriesLibrary' concatenates root paths with directory names.
-      for i in [ 1 .. Length( rootpaths ) ] do
-        if not EndsWith( rootpaths[i], "/" ) then
-          rootpaths[i]:= Concatenation( rootpaths[i], "/" );
-        fi;
-      od;
-      # Append the new root paths.
-      GAPInfo.RootPaths:= Immutable( Concatenation( GAPInfo.RootPaths,
-          rootpaths ) );
+    local path, changed;
+
+    changed:= false;
+    for path in rootpaths do
+      if not EndsWith( path, "/" ) then
+        path:= Concatenation( path, "/" );
+      fi;
+      if not path in GAPInfo.RootPaths then
+        Add( GAPInfo.RootPaths, path );
+        changed:= true;
+      fi;
+    od;
+    if changed then
       # Clear the cache.
       GAPInfo.DirectoriesLibrary:= AtomicRecord( rec() );
       # Reread the package information.

src/sysroots.c

@@ -137,6 +137,7 @@ void SySetGapRootPath(const Char * string)
         if (q == p) {
             // empty string treated as ./
             path = MakeString("./");
+            // TODO: insert output of getcwd??
         } else {
             path = MakeStringWithLen(p, q - p);