Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / pynacl / file_tools.py

diff --git a/src/native_client/pynacl/file_tools.py b/src/native_client/pynacl/file_tools.py
index 60dd65e..1a30c62 100755 (executable)
--- a/src/native_client/pynacl/file_tools.py
+++ b/src/native_client/pynacl/file_tools.py
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Convience stand-alone file operations."""
+"""Convience file system related operations."""
 
 
 import os
@@ -186,7 +186,7 @@ def MoveAndMergeDirTree(src_dir, dest_dir):
       if os.path.exists(destination_item):
         if os.path.isdir(destination_item) and os.path.isdir(source_item):
           # Merge the sub-directories together if they are both directories.
-          MoveDirTree(source_item, destination_item)
+          MoveAndMergeDirTree(source_item, destination_item)
         elif os.path.isfile(destination_item) and os.path.isfile(source_item):
           # Overwrite the file if they are both files.
           os.unlink(destination_item)