@@ -48,16 +48,12 @@ def _fswalk_follow_symlinks(path):

 			handle_exclude_include_walk(dirpath, dirnames, [])

                         yield (dirpath, dirnames, filenames)

-def _fswalk(path, follow_symlinks):

+def _fswalk_no_symlinks(path):

         '''

         Directory tree generator

         path (str) is the root of the directory tree to walk

-

-        follow_symlinks (bool) indicates whether to descend into symbolically linked directories

         '''

-        if follow_symlinks:

-                yield _fswalk_follow_symlinks(path)

 	for dirpath, dirnames, filenames in os.walk(path):

 		handle_exclude_include_walk(dirpath, dirnames, filenames)

 		yield (dirpath, dirnames, filenames)

@@ -155,7 +151,10 @@ def fetch_local_list(args, recursive = None):

         if local_uri.isdir():

             local_base = deunicodise(local_uri.basename())

             local_path = deunicodise(local_uri.path())

-            filelist = _fswalk(local_path, cfg.follow_symlinks)

+            if cfg.follow_symlinks:

+                filelist = _fswalk_follow_symlinks(local_path)

+            else:

+                filelist = _fswalk_no_symlinks(local_path)

             single_file = False

         else:

             local_base = ""

@@ -485,7 +485,7 @@ test_s3cmd("Put symbolic links", ['put', 'testsuite/etc/linked1.png', 's3://%s/x

 ## ====== Sync symbolic links

 test_s3cmd("Sync symbolic links", ['sync', 'testsuite/', 's3://%s/xyz/' % bucket(1), '--no-encrypt', '--follow-symlinks' ],

-    must_find = ["File 'testsuite/etc/linked.png' stored as '%s/xyz/etc/linked.png'" % pbucket(1)],

+    must_find = ["remote copy: etc2/Logo.PNG -> etc/linked.png"],

            # Don't want to recursively copy linked directories!

            must_not_find_re = ["etc/more/linked-dir/more/give-me-more.txt",

                                "etc/brokenlink.png"],