Merge pull request #1374 from brainpage/symlink_fix

symlink fix

Merge pull request #1374 from brainpage/symlink_fix
symlink fix
655682b7 · Michael DeHaan · 1e6e5c21 · 702469f7 · 655682b7
Commit 655682b7 authored Oct 18, 2012 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

library/file
+1 -1

No files found.
--- a/library/file
+++ b/library/file
@@ -340,7 +340,7 @@ def main():
    if src:
        src = os.path.expanduser(src)

-    if src is not None and os.path.isdir(path):
+    if src is not None and os.path.isdir(path) and state != "link":
        params['path'] = path = os.path.join(path, os.path.basename(src))

    mode   = params.get('mode', None)