Make certain ingested paths are relative to root.

lsst · Aug 8, 2018 · 93dd568 · 93dd568
1 parent 202ea4c
commit 93dd568
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/python/lsst/daf/butler/datastores/posixDatastore.py b/python/lsst/daf/butler/datastores/posixDatastore.py
@@ -397,8 +397,9 @@ def ingest(self, path, ref, formatter=None, transfer=None):
         if transfer is None:
             if os.path.isabs(path):
                 absRoot = os.path.abspath(self.root)
-                if os.path.commonpath([absRoot, os.path.abspath(path)]) != absRoot:
+                if os.path.commonpath([absRoot, path]) != absRoot:
                     raise RuntimeError("'{}' is not inside repository root '{}'".format(path, self.root))
+                path = os.path.relpath(path, absRoot)
         else:
             template = self.templates.getTemplate(ref.datasetType.name)
             location = self.locationFactory.fromPath(template.format(ref))