lib/autoproj/ops/loader.rb in autoproj-2.0.0.rc37 vs lib/autoproj/ops/loader.rb in autoproj-2.0.0.rc38

@@ -13,10 +13,13 @@
             @file_stack = Array.new
             @loaded_autobuild_files = Set.new
         end
 
         def in_package_set(pkg_set, path)
-            @file_stack.push([pkg_set, File.expand_path(path).gsub(/^#{Regexp.quote(root_dir)}\//, '')])
+            if path
+                path = File.expand_path(path, root_dir)
+            end
+            @file_stack.push([pkg_set, path])
             yield
         ensure
             @file_stack.pop
         end