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

fix webapp reversion caused by relative path changes

Browse source 
webapp: When adding another local repository, and combining it with the
current repository, the new repository's remote path was set to "." rather
than the path to the current repository. This was a reversion caused by the
relative path changes in 5.20150113.
This commit is contained in:
Joey Hess 2015-04-09 14:59:08 -04:00
parent 148d5b2009
commit 2736c59204
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Assistant/WebApp/Configurators/Local.hs
View file

@ -347,8 +347,9 @@ getFinishAddDriveR drive = go
combineRepos :: FilePath -> String -> Handler Remote combineRepos :: FilePath -> String -> Handler Remote
combineRepos dir name = liftAnnex $ do combineRepos dir name = liftAnnex $ do
hostname <- fromMaybe "host" <$> liftIO getHostname hostname <- fromMaybe "host" <$> liftIO getHostname
hostlocation <- fromRepo Git.repoLocation mylocation <- fromRepo Git.repoLocation
liftIO $ inDir dir $ void $ makeGitRemote hostname hostlocation mypath <- liftIO $ relPathDirToFile dir mylocation
liftIO $ inDir dir $ void $ makeGitRemote hostname mypath
addRemote $ makeGitRemote name dir addRemote $ makeGitRemote name dir
getEnableDirectoryR :: UUID -> Handler Html getEnableDirectoryR :: UUID -> Handler Html

6
debian/changelog vendored
View file

@ -1,4 +1,4 @@
git-annex (5.20150406.2) UNRELEASED; urgency=medium git-annex (5.20150409) UNRELEASED; urgency=medium
* This fixes a bug in the assistant introduced by the literal pathspec * This fixes a bug in the assistant introduced by the literal pathspec
changes in version 5.20150406. changes in version 5.20150406.
@ -16,6 +16,10 @@ git-annex (5.20150406.2) UNRELEASED; urgency=medium
repo. repo.
* importfeed: Fix feed download when curl is used. * importfeed: Fix feed download when curl is used.
* importfeed: Error out when passed a non-url. * importfeed: Error out when passed a non-url.
* webapp: When adding another local repository, and combining it
with the current repository, the new repository's remote path
was set to "." rather than the path to the current repository.
This was a reversion caused by the relative path changes in 5.20150113.
-- Joey Hess <id@joeyh.name> Mon, 06 Apr 2015 20:14:20 -0400 -- Joey Hess <id@joeyh.name> Mon, 06 Apr 2015 20:14:20 -0400

14
doc/forum/Adding_a_mounted_network/comment_2_ae3d4ac918ef002ead859ed0c962ae32._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2015-04-09T18:33:47Z"
content="""
If you want to do with using the webapp, go to the "Repository"
menu in the upper-left, and select "Add another local repository."
You can then enter the path to your repository, whevever it is,
and click on "combine the repositories"
But, like Justin said, this just sets up a git remote, so doing it at
the command line will work just as well.
"""]]