Change to variable names around symlink creation

1 files changed, 9 insertions, 5 deletions

diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index fd6778cfa..59ca76f78 100644
--- a/buildstream/storage/_casbaseddirectory.py
+++ b/buildstream/storage/_casbaseddirectory.py
@@ -292,7 +292,7 @@ class CasBasedDirectory(Directory):
         for name in sorted(os.listdir(source_directory)):
             pathname = os.path.join(source_directory, name)
             if os.path.islink(pathname):
-                self._add_new_link(pathname, name)
+                self._add_new_link(source_directory, name)
                 result.files_written.append(os.path.join(path_prefix,name))
             elif os.path.isdir(pathname):
                 #print("Attempting to import DIRECTORY {} from {}".format(name, source_directory))
@@ -424,12 +424,16 @@ class CasBasedDirectory(Directory):
                          stat.S_IRGRP | stat.S_IXGRP |
                          stat.S_IROTH | stat.S_IXOTH)
         for entry in self.directory.symlinks:
-            src_name = entry.target
-            dest_name = os.path.join(to_directory, entry.name)
+            print("Extract symlink. Entry name is {} and entry target is {}.".format(entry.name, entry.target))
+            print("Name exists: {}. Target exists: {}".format(os.path.exists(os.path.join(to_directory, entry.name)), os.path.exists(entry.target)))
+            src_name = os.path.join(to_directory, entry.name)
+            target_name = entry.target
             try:
-                os.symlink(src_name, dest_name)
+                print("os.symlink({},{})".format(target_name, src_name))
+                os.symlink(target_name, src_name)
+                print("Symlink successfully created")
             except FileExistsError as e:
-                raise BstError("Cannot symlink {}/{} to {}. Original error was: {}".format(str(self),src_name,entry.name,e))
+                raise BstError("Cannot create a symlink named {}/{} pointing to {}. Original error was: {}".format(src_name,entry.target,e))
 
     def is_empty(self) -> bool:
         """ Return true if this directory has no files, subdirectories or links in it.