diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-10-15 15:28:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-15 15:36:54 -0400 |
| commit | 68ac4d8240612e43bf2a5b875d527f7912b10412 (patch) | |
| tree | d91fffe25ea296d87ef9f09f2733ccf7b88d6535 /Remote | |
| parent | a2194926bf04d79816195d79f6549b0276414813 (diff) | |
Avoid displaying network transport warning when a ssh remote does not yet have an annex.uuid set.
Instead, only display transport error if the configlist output doesn't
include an annex.uuid line, even an empty one.
A recent change made git-annex init try to get all the remote uuids, and so
the transport error would be displayed by it. It was also displayed when
eg, copying files to a remote that had no uuid yet.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 1c2573642..33eadd3d0 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -221,7 +221,7 @@ tryGitConfigRead autoinit r v <- Git.Config.fromPipe r cmd params case v of Right (r', val) -> do - when (getUncachedUUID r' == NoUUID && not (null val)) $ do + unless (isUUIDConfigured r' || null val) $ do warningIO $ "Failed to get annex.uuid configuration of repository " ++ Git.repoDescribe r warningIO $ "Instead, got: " ++ show val warningIO $ "This is unexpected; please check the network transport!" |