mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp: Fix deletion of current repository directory.

Browse source 
removeDirectoryRecursive "." fails; need full path.

I think this is a reversion introduced in the relative path conversion, in
january of *last* year!
This commit is contained in:
Joey Hess 2016-01-29 14:04:39 -04:00
parent 5e4ddd32a0
commit ef4b4c3856
Failed to extract signature
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/Delete.hs
View file

@ -104,7 +104,7 @@ deleteCurrentRepository = dangerPage $ do
liftIO $ do liftIO $ do
recurseDir SystemFS dir recurseDir SystemFS dir
>>= mapM_ (void . tryIO . allowWrite) >>= mapM_ (void . tryIO . allowWrite)
removeDirectoryRecursive dir removeDirectoryRecursive =<< absPath dir
redirect ShutdownConfirmedR redirect ShutdownConfirmedR
_ -> $(widgetFile "configurators/delete/currentrepository") _ -> $(widgetFile "configurators/delete/currentrepository")

1
debian/changelog vendored
View file

@ -4,6 +4,7 @@ git-annex (6.20160127) UNRELEASED; urgency=medium
adding files not matching annex.largefiles. adding files not matching annex.largefiles.
* Fix reversion in lookupkey, contentlocation, and examinekey which * Fix reversion in lookupkey, contentlocation, and examinekey which
caused them to sometimes output side messages. caused them to sometimes output side messages.
* webapp: Fix deletion of current repository directory.
-- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400 -- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400

2
doc/bugs/removeDirectoryRecursive.mdwn
View file

@ -27,4 +27,4 @@ I just downloaded and installed Git Annex. This problem was there from day 1.
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
> Fixed it to properly delete the repo. [[done]] --[[Joey]]

12
doc/bugs/removeDirectoryRecursive/comment_1_dc8d7f4072833b013e17935b657a9cdd._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2016-01-29T17:59:18Z"
content="""
Reproduced this. The repository deletion seems to work, except it falls on
the last hurdle, of removing the actual repository itself. This also
prevents the webapp from shutting down properly.
So, to get out of this state, kill git-annex and delete the directory
yourself.
"""]]