Merge branch 'ael-code/skip_nonexisting'

anishathalye · Nov 19, 2016 · 4468fff · 4468fff
2 parents 295f8e3 + 58c8b98
commit 4468fff
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/plugins/link.py b/plugins/link.py
@@ -1,4 +1,7 @@
-import os, shutil, dotbot
+import os
+import shutil
+import dotbot
+
 
 class Link(dotbot.Plugin):
     '''
@@ -34,11 +37,15 @@ def _process_links(self, links):
             else:
                 path = source
             path = os.path.expandvars(os.path.expanduser(path))
+            if not self._exists(os.path.join(self._context.base_directory(), path)):
+                success = False
+                self._log.warning('Nonexistent target %s -> %s' %
+                    (destination, path))
+                continue
             if create:
                 success &= self._create(destination)
             if force or relink:
-                if self._exists(path):
-                    success &= self._delete(path, destination, relative, force)
+                success &= self._delete(path, destination, relative, force)
             success &= self._link(path, destination, relative)
         if success:
             self._log.info('All links have been set up')