kadischi/lib functions.py,1.11,1.12

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7276/kadischi/lib

Modified Files:
	functions.py 
Log Message:
Fixes, loose ends for kadischi functionality since rewrites.


Index: functions.py
===================================================================
RCS file: /cvs/devel/kadischi/lib/functions.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- functions.py	4 Jul 2006 20:56:02 -0000	1.11
+++ functions.py	5 Jul 2006 05:34:45 -0000	1.12
@@ -70,7 +70,10 @@
 def clean_directory (dir, remove_when_done=True, keep_child_directories=False):
     """Removes all files in a directory, optionally removing the directory afterwards"""
     assert os.path.isdir and not os.path.islink (dir)
-    file_list = os.listdir (dir)
+    try:
+        file_list = os.listdir (dir)
+    except:
+        pass
 
     for f in file_list:
         path = os.path.join (dir, f)
@@ -100,7 +103,10 @@
         os.unlink ('/tmp/product/.buildstamp')
         shutil.move (normalize_path([builddir,'.buildstamp']), '/tmp/product/.buildstamp')
     else:
-        os.unlink ('/tmp/product/.buildstamp')
+        try:
+            os.unlink ('/tmp/product/.buildstamp')
+        except:
+            pass
     clean_directory (builddir)
 
 def run (command, builddir = None):