Merge pull request #19 from arcticicestudio/bugfix/ghi-#18-only-last-…

…duplicate-link-item-processed-when-using-host-specific-option #18 Only last duplicate link item processed when using host specific option
arcticicestudio · Jan 28, 2017 · b921c48 · b921c48
2 parents e318b8d + d4ed045
commit b921c48
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/snowsaw/plugins/link.py b/snowsaw/plugins/link.py
@@ -34,7 +34,7 @@ def _process_links(self, links):
             force = defaults.get("force", False)
             relink = defaults.get("relink", False)
             create = defaults.get("create", False)
-            hosts = defaults.get("hosts", [])
+            hosts = defaults.get("hosts", {})
             if isinstance(source, dict):
                 relative = source.get("relative", relative)
                 force = source.get("force", force)
@@ -46,9 +46,13 @@ def _process_links(self, links):
                 path = self._default_source(destination, source)
             path = os.path.expandvars(os.path.expanduser(path))
 
-            if not self._is_target_host(hosts, hostname):
-                self._log.lowinfo("Skipped host specific link {} -> {}".format(destination, os.path.join(self._context.snowblock_dir(), path)))
-                continue
+            if hosts:
+                for host in hosts.items():
+                    if not host[0] == hostname:
+                        self._log.lowinfo("Skipped host specific link {} -> {}".format(destination, os.path.join(self._context.snowblock_dir(), host[1])))
+                        continue
+                    else:
+                        path = os.path.expandvars(os.path.expanduser(hosts.get(hostname)))
 
             if not self._exists(os.path.join(self._context.snowblock_dir(), path)):
                 success = False
@@ -97,18 +101,6 @@ def _is_link(self, path):
         """
         return os.path.islink(os.path.expanduser(path))
 
-    def _is_target_host(self, hosts, host):
-        """
-        Checks if the specified host is a target.
-
-        A empty default list of target hosts indicates that all hosts are allowed.
-
-        :param hosts: The list of target hosts
-        :param host: The name of the host to check
-        :return: True if the specified host is listed or the hosts list is empty, False otherwise
-        """
-        return True if not hosts or host in hosts else False
-
     def _link_destination(self, path):
         """
         Gets the destination of the specified symbolic link.