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

got hdevtools working again

Browse source 
Fix comment to not make cpp unhappy
This commit is contained in:
Joey Hess 2013-07-27 13:00:49 -04:00
parent 4c6bccd5c8
commit 2d7b4517ab
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Ssh.hs
View file

@ -169,7 +169,7 @@ genSshKeyPair = withTmpDir "git-annex-keygen" $ \dir -> do
- -
- Note that the key files are put in ~/.ssh/git-annex/, rather than directly - Note that the key files are put in ~/.ssh/git-annex/, rather than directly
- in ssh because of an **INSANE** behavior of gnome-keyring: It loads - in ssh because of an **INSANE** behavior of gnome-keyring: It loads
- ~/.ssh/*.pub, and uses them indiscriminately. But using this key - ~/.ssh/ANYTHING.pub, and uses them indiscriminately. But using this key
- for a normal login to the server will force git-annex-shell to run, - for a normal login to the server will force git-annex-shell to run,
- and locks the user out. Luckily, it does not recurse into subdirectories. - and locks the user out. Luckily, it does not recurse into subdirectories.
-} -}

2
Makefile
View file

@ -211,6 +211,6 @@ dist/caballog: git-annex.cabal
# TODO should be possible to derive this from caballog. # TODO should be possible to derive this from caballog.
hdevtools: hdevtools:
hdevtools --stop-server || true hdevtools --stop-server || true
hdevtools check git-annex.hs -g -cpp -g -i -g -idist/build/git-annex/git-annex-tmp -g -i. -g -idist/build/autogen -g -Idist/build/autogen -g -Idist/build/git-annex/git-annex-tmp -g -IUtility -g -DWITH_TESTSUITE -g -DWITH_S3 -g -DWITH_ASSISTANT -g -DWITH_INOTIFY -g -DWITH_DBUS -g -DWITH_PAIRING -g -DWITH_XMPP -g -optP-include -g -optPdist/build/autogen/cabal_macros.h -g -odir -g dist/build/git-annex/git-annex-tmp -g -hidir -g dist/build/git-annex/git-annex-tmp -g -stubdir -g dist/build/git-annex/git-annex-tmp -g -threaded -g -Wall -g -XHaskell98 hdevtools check git-annex.hs -g -cpp -g -i -g -idist/build/git-annex/git-annex-tmp -g -i. -g -idist/build/autogen -g -Idist/build/autogen -g -Idist/build/git-annex/git-annex-tmp -g -IUtility -g -DWITH_TESTSUITE -g -DWITH_S3 -g -DWITH_ASSISTANT -g -DWITH_INOTIFY -g -DWITH_DBUS -g -DWITH_PAIRING -g -DWITH_XMPP -g -optP-include -g -optPdist/build/autogen/cabal_macros.h -g -odir -g dist/build/git-annex/git-annex-tmp -g -hidir -g dist/build/git-annex/git-annex-tmp -g -stubdir -g dist/build/git-annex/git-annex-tmp -g -threaded -g -Wall -g -XHaskell98 -g -XPackageImports
.PHONY: git-annex tags build-stamp .PHONY: git-annex tags build-stamp