keep going on errors
This commit is contained in:
parent
949f23dd7b
commit
8f42fda97d
1 changed files with 10 additions and 2 deletions
12
koji/util.py
12
koji/util.py
|
|
@ -345,7 +345,11 @@ def _rmtree2(dev):
|
||||||
os.chdir('..')
|
os.chdir('..')
|
||||||
dirs = dirstack.pop()
|
dirs = dirstack.pop()
|
||||||
empty_dir = dirs.pop()
|
empty_dir = dirs.pop()
|
||||||
os.rmdir(empty_dir)
|
try:
|
||||||
|
os.rmdir(empty_dir)
|
||||||
|
except OSError:
|
||||||
|
# we'll still fail at the top level
|
||||||
|
pass
|
||||||
if not dirs:
|
if not dirs:
|
||||||
# we are done
|
# we are done
|
||||||
break
|
break
|
||||||
|
|
@ -367,7 +371,11 @@ def _stripcwd(dev):
|
||||||
if stat.S_ISDIR(st.st_mode):
|
if stat.S_ISDIR(st.st_mode):
|
||||||
dirs.append(fn)
|
dirs.append(fn)
|
||||||
else:
|
else:
|
||||||
os.unlink(fn)
|
try:
|
||||||
|
os.unlink(fn)
|
||||||
|
except OSError:
|
||||||
|
# we'll still fail at the top level
|
||||||
|
pass
|
||||||
return dirs
|
return dirs
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue