From 837116ef1e253f82726b023bfe6ca46777060e27 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2021 12:34:19 -0400 Subject: [PATCH] Fix support for readonly git remotes Boolean blindness oops. (Reversion in version 8.20210621) Sponsored-by: Dartmouth College's Datalad project --- CHANGELOG | 2 ++ Database/Keys.hs | 4 ++-- ...ment_3_a4f9bb23f0682a66e951b96aed6ae214._comment | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 doc/bugs/unable_to_get_content_via_ssh_without_write_perms/comment_3_a4f9bb23f0682a66e951b96aed6ae214._comment diff --git a/CHANGELOG b/CHANGELOG index ab4f9202ca..897b010072 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,8 @@ git-annex (8.20210804) UNRELEASED; urgency=medium servers. * add: Detect when xattrs or perhaps ACLs prevent locking down a file's content, and fail with an informative message. + * Fix support for readonly git remotes. + (Reversion in version 8.20210621) -- Joey Hess Tue, 03 Aug 2021 12:22:45 -0400 diff --git a/Database/Keys.hs b/Database/Keys.hs index 04fef03d2a..4aeee67bd1 100644 --- a/Database/Keys.hs +++ b/Database/Keys.hs @@ -75,7 +75,7 @@ runReader a = do v <- a (SQL.ReadHandle qh) return (v, st) go DbClosed = do - st' <- openDb True DbClosed + st' <- openDb False DbClosed v <- case st' of (DbOpen qh) -> a (SQL.ReadHandle qh) _ -> return mempty @@ -97,7 +97,7 @@ runWriter a = do v <- a (SQL.WriteHandle qh) return (v, st) go st = do - st' <- openDb False st + st' <- openDb True st v <- case st' of DbOpen qh -> a (SQL.WriteHandle qh) _ -> error "internal" diff --git a/doc/bugs/unable_to_get_content_via_ssh_without_write_perms/comment_3_a4f9bb23f0682a66e951b96aed6ae214._comment b/doc/bugs/unable_to_get_content_via_ssh_without_write_perms/comment_3_a4f9bb23f0682a66e951b96aed6ae214._comment new file mode 100644 index 0000000000..dc74a9b096 --- /dev/null +++ b/doc/bugs/unable_to_get_content_via_ssh_without_write_perms/comment_3_a4f9bb23f0682a66e951b96aed6ae214._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2021-08-30T16:24:52Z" + content=""" +reversion in [[!commit f46e4c9b7c]], which reversed some logic and made +database reads be treated as database writes, so they failed on permission +denied, rather than the right behavior of returning DbUnavailable. Fixed that. + +I have not been able to reproduce the other error involving +opening a temp file. All I can tell from the message is that it's writing +to some file in .git/annex via a temp file in the same directory. +"""]] -- 2.30.2