[Erp5-report] r7312 - /umigumi/trunk/umibuilder.py

[nobody at svn.erp5.org]

Author: kevin
Date: Wed May 17 13:32:20 2006
New Revision: 7312

URL: http://svn.erp5.org?rev=7312&view=rev
Log:
Test existence of source before copy.
Factorize code.

Modified:
    umigumi/trunk/umibuilder.py

Modified: umigumi/trunk/umibuilder.py
URL: http://svn.erp5.org/umigumi/trunk/umibuilder.py?rev=7312&r1=7311&r2=7312&view=diff
==============================================================================
--- umigumi/trunk/umibuilder.py (original)
+++ umigumi/trunk/umibuilder.py Wed May 17 13:32:20 2006
@@ -147,17 +147,20 @@
   '''
     Copy all files and directories from src to dest.
   '''
+  def cp(s, d):
+    if os.path.exists(s):
+      if os.path.isdir(s):
+        executeCommand('cp -dR %s/* %s' % (s, d), 0)
+      else:
+        executeCommand('cp -d %s %s' % (s, d), 0)
+
+  # Support copy of multiple sources
   if isinstance(src, list):
     for tmp_dir in src:
-      if os.path.isdir(tmp_dir):
-        executeCommand('cp -dR %s/* %s' % (tmp_dir, dest), 0)
-      else:
-        executeCommand('cp -d %s %s' % (tmp_dir, dest), 0)
+      cp(tmp_dir, dest)
   else:
-    if os.path.isdir(src):
-      executeCommand('cp -dR %s/* %s' % (src, dest), 0)
-    else:
-      executeCommand('cp -d %s %s' % (src, dest), 0)
+    cp(src, dest)
+
   #removing .svn, CVS directories & backup files (by Chris)
   os.system('find %s -name CVS -exec rm -rf {} \; 2>/dev/null' % dest)
   os.system('find %s -name .svn -exec rm -rf {} \; 2>/dev/null' % dest)