instant team mailing list archive

[Johannes Ring <johannr@xxxxxxxxx>]

On Thu, Jun 23, 2011 at 7:31 PM, Johan Hake <johan.hake@xxxxxxxxx> wrote:
> On Thursday June 23 2011 10:28:34 Johannes Ring wrote:
>> I get this when I run instant-clean now:
>>
>> $ instant-clean
>> Created temp directory '/tmp/tmp2mm3OQ2011-6-23-19-21_instant'.
>> Removing 0 modules from Instant cache...
>> Removing 23 error logs from Instant cache...
>> Traceback (most recent call last):
>>   File "/home/johannr/fenics-dev/bin/instant-clean", line 57, in <module>
>>     os.remove(os.path.join(error_dir, error_log))
>> OSError: [Errno 21] Is a directory:
>> '/home/johannr/.instant/error/dolfin_compile_code_8141410e773e4310c4c20e4e1
>> f1f22d4'
>
> Damn it!
>
> Could yo have a look at it... My computer has suddenly start complaining about
> alot. Therefore the sloppy craftmanship lately ;)

Patch attached (includes ChangeLog fix).

Johannes

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: johannr@xxxxxxxxx-20110623180847-6r9meekpv5j0lvw4
# target_branch: bzr+ssh://bazaar.launchpad.net/~instant-\
#   core/instant/main/
# testament_sha1: afa0487a0ea7b012c0a9ea8cb2a3f42b340fa6c2
# timestamp: 2011-06-23 20:09:15 +0200
# base_revision_id: hake.dev@xxxxxxxxx-20110623170906-nym4hsdk47os70mg
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2011-06-23 17:09:06 +0000
+++ ChangeLog	2011-06-23 18:07:10 +0000
@@ -1,5 +1,5 @@
- - Error log is now copied to ~./instant/error/module_name/compile.log
-   and ./instant/error/compile.log for easier retrieval 
+ - Error log is now copied to ~/.instant/error/module_name/compile.log
+   and ~/.instant/error/compile.log for easier retrieval
 0.9.10 [2011-05-16]
  - Added support for setting swig binary and swig path
 0.9.9 [2011-02-23]

=== modified file 'scripts/instant-clean'
--- scripts/instant-clean	2011-06-23 17:09:06 +0000
+++ scripts/instant-clean	2011-06-23 18:08:47 +0000
@@ -54,7 +54,10 @@
 
 print "Removing %d error logs from Instant cache..." % len(error_logs)
 for error_log in error_logs:
-    os.remove(os.path.join(error_dir, error_log))
+    if os.path.isdir(os.path.join(error_dir, error_log)):
+        shutil.rmtree(os.path.join(error_dir, error_log))
+    else:
+        os.remove(os.path.join(error_dir, error_log))
 
 print "Removing %d lock files from Instant cache..." % len(lockfiles+error_lockfiles)
 for lf in lockfiles:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUCVBRcAAtNfgEQQUGf/91sW
lAC////xUAWNb3M2ysrO1bdcG7UMEpJ6pjTSR4p+iZTyMiaYmRoGmjQ0AkoKeFNpo1Mpgp6Mo0yN
lBoGQAEimhRhU3ppJ+miT1D1PU9MkAABkBzAATAAEwAAAAACpRAjQnoFPU2hPU0Nqn6kHqeobUPK
B6ihTYeckBweZCunJVDDA1bDfHCGOtrVoESUcQJ1ixQadOoFCHEus9dGm19PiH5maB3TlhETiZN3
TiNRbyOnnz+r04HUsnx+HFaWQxGP3VRjAIi+18duR0vCKorn9n8xPe1IitmZbiVvTXLQ464n4RqS
UEUF2GgY+EeikcW6RfzjXHLP+DOWuEHGMPZuY35ZPffhSUpU28rA1tEJD9vOflRiy9gjR1PhKpNF
SSLUVBG9BmxXErtNLETFciH0RJDuvMKlD9fkU0OriDGIhjJ3aRQYRkCNENgdvtLUBEkQkiBEo8hj
DlnoLVPkGchNZ+ihUplXWTrVFbHi6ScdsWqGTarwdenU4U93KHbG/jKfjGKhFY3M7LARnmYD1j2Z
ozhZb7blkbjbelQnOL2WZgiJeY3tg5iybXabhmFerAsdC12hlHrFor2kBidkTQ2MxOM90S3NHBbD
SDwjFxXvRtkh5r1lS/eZzxqTqRr2VoU0450hFf6Lkgw339je0RKJm5D14sLogjfSqDLMsjcTuKZT
lmLAtDOTxwsW6asTlGyF74rd8xq0Lmjubm5LVympspKxljKYhq3KJudcusdWlhqXXKXfSHXFrR76
xWt9kUXpJMaYQ6kDvUg1FCyGEDS+JHAx5C1eEiFw1VuVZNDe0LYrqZl0VWFqqUXqXGeTDBR4jMyO
osHsTfa25cToeo9CMkBcVbE2/tojvjxc1Nz7/h4VI06bVja3qGlCfLjQMvOgNmRunUXNnXwvymwz
4DXT/zZNFG+UjmhgI52vKUTcg9DDbYkxKEZlwSLRjrRfjKlH1+t29zbrNu+u7wi5f1tVL+1s8ESi
ya1DKOxzGIzax6/zCG0u2aXqd9AzehURlVCOq0NtvW0teEYJRYnUuU0xTkY9JSL3a5vpq/KLHFlt
/yciXDGXA6UijH5LjDoXl8+K3jkWTGk7ufaKF10/pNXp7tRXmHiaiiuAqMCoTXDASUQFrfYUHHHB
HETBat6PDrsdncea4LuNZ9LjaHOt6HtAlQUDFheX6RVZdidbTlah2DHBn5G0nSlgbg2qM8GInQ9l
JbWStXrG97j2hmiz4DGP7saJCzpF3UmeeDtank8ko782C/n3G+LeLBQqYQcGueUmXm9vpf4ulnB0
5Ks7SOcNpjj9473+7sz9OifOGiNjYpkUVUrrap5Q+WyKOyOUnenpFnRLBsGxUc4LU+1Fc5hxWNTj
pmeYv1Twjvj848Ud6L10FsLBNHEmbr5EQeTkkD2Jg4YwVcCFNKZ3ElCwGkGKAitEBICZaMYwaVol
Evj4/dfB6xpy3z2pHs7iOyGkfZmll90IL0oR7JCx7l/vmjZjayu0YxZhAUTLfNQ8U2w2wwnHjYUi
xQ801QWRPm29WZGWl81TH4YZ4zVs1uEPXBGElGVKx4wpGbmtXekcsvlQpqdm3zgzC1ofWhTQcBiM
1UxhVV6HbkjC1aozuBkzJs3sdJfokzp3aa4UTWw3cERQDuJPls3ioLGgmgfFBkJ+8XRGJBKwoI98
0a4KBmf8XckU4UJBAlQUXA==