diff options
author | 2012-06-05 20:30:37 -0400 | |
---|---|---|
committer | 2012-06-05 20:30:37 -0400 | |
commit | a7a729bce4db901a1142b5ef7ab8cab0d1311a66 (patch) | |
tree | 87ac0ab8e35e7485dc58828b8d82ad2a383ff036 /test.hs | |
parent | e6b157cc099f6d0a5ea26da823bfb6ab8ea4dbc7 (diff) | |
parent | c981ccc0773a02ca60eb6456f04de14cd758ee7b (diff) |
Merge branch 'master' into watch
Diffstat (limited to 'test.hs')
-rw-r--r-- | test.hs | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -171,7 +171,8 @@ test_reinject :: Test test_reinject = "git-annex reinject/fromkey" ~: TestCase $ intmpclonerepo $ do git_annex "drop" ["--force", sha1annexedfile] @? "drop failed" writeFile tmp $ content sha1annexedfile - r <- annexeval $ Types.Backend.getKey backendSHA1 tmp + r <- annexeval $ Types.Backend.getKey backendSHA1 $ + Types.Backend.KeySource { Types.Backend.keyFilename = tmp, Types.Backend.contentLocation = tmp } let key = show $ fromJust r git_annex "reinject" [tmp, sha1annexedfile] @? "reinject failed" git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed" |