Fix deleting series trash directory
authorRoland Dreier <rdreier@cisco.com>
Thu, 3 May 2007 18:29:41 +0000 (11:29 -0700)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 14 May 2007 21:16:53 +0000 (22:16 +0100)
When deleting a series, the loop that iterates through the files in
__trash_dir needs to add __trash_dir to the filename that it passes to
os.remove().

Signed-off-by: Roland Dreier <rolandd@cisco.com>
stgit/stack.py

index 2477ac6..0cf7947 100644 (file)
@@ -639,7 +639,7 @@ class Series(StgitObject):
 
             # remove the trash directory
             for fname in os.listdir(self.__trash_dir):
-                os.remove(fname)
+                os.remove(os.path.join(self.__trash_dir, fname))
             os.rmdir(self.__trash_dir)
 
             # FIXME: find a way to get rid of those manual removals