rekey: No longer copies over urls from the old to the new key.

It makes sense for migrate to do that, but not for this low-level (and
little used) plumbing command to.
This commit is contained in:
Joey Hess 2016-01-07 18:06:20 -04:00
parent 2b781cbf7b
commit d6fe7fdd7d
Failed to extract signature
3 changed files with 11 additions and 9 deletions

View file

@ -18,6 +18,8 @@ import qualified Command.ReKey
import qualified Command.Fsck
import qualified Annex
import Logs.MetaData
import Logs.Web
import qualified Remote
cmd :: Command
cmd = notDirect $ withGlobalOptions annexedMatchingOptions $
@ -77,6 +79,12 @@ perform file oldkey oldbackend newbackend = go =<< genkey
finish newkey = ifM (Command.ReKey.linkKey file oldkey newkey)
( do
copyMetaData oldkey newkey
-- If the old key had some associated urls, record them for
-- the new key as well.
urls <- getUrls oldkey
forM_ urls $ \url -> do
r <- Remote.claimingUrl url
setUrlPresent (Remote.uuid r) newkey url
next $ Command.ReKey.cleanup file oldkey newkey
, error "failed"
)