gcrypt inherits shellescape setting from rsync, allow it
This commit is contained in:
parent
923230ea30
commit
201049cf93
2 changed files with 12 additions and 5 deletions
|
@ -66,8 +66,9 @@ remote = specialRemoteType $ RemoteType
|
|||
-- and will call our gen on them.
|
||||
, enumerate = const (return [])
|
||||
, generate = gen
|
||||
, configParser = mkRemoteConfigParser
|
||||
[optionalStringParser gitRepoField]
|
||||
, configParser = mkRemoteConfigParser $
|
||||
Remote.Rsync.rsyncRemoteConfigs ++
|
||||
[ optionalStringParser gitRepoField ]
|
||||
, setup = gCryptSetup
|
||||
, exportSupported = exportUnsupported
|
||||
, importSupported = importUnsupported
|
||||
|
|
|
@ -14,6 +14,7 @@ module Remote.Rsync (
|
|||
remove,
|
||||
checkKey,
|
||||
withRsyncScratchDir,
|
||||
rsyncRemoteConfigs,
|
||||
genRsyncOpts,
|
||||
RsyncOpts
|
||||
) where
|
||||
|
@ -51,9 +52,8 @@ remote = specialRemoteType $ RemoteType
|
|||
{ typename = "rsync"
|
||||
, enumerate = const (findSpecialRemotes "rsyncurl")
|
||||
, generate = gen
|
||||
, configParser = mkRemoteConfigParser
|
||||
[ yesNoParser shellEscapeField True
|
||||
, optionalStringParser rsyncUrlField
|
||||
, configParser = mkRemoteConfigParser $ rsyncRemoteConfigs ++
|
||||
[ optionalStringParser rsyncUrlField
|
||||
]
|
||||
, setup = rsyncSetup
|
||||
, exportSupported = exportIsSupported
|
||||
|
@ -123,6 +123,12 @@ gen r u c gc rs = do
|
|||
-- Rsync displays its own progress.
|
||||
{ displayProgress = False }
|
||||
|
||||
-- Things used by genRsyncOpts
|
||||
rsyncRemoteConfigs :: [RemoteConfigFieldParser]
|
||||
rsyncRemoteConfigs =
|
||||
[ yesNoParser shellEscapeField True
|
||||
]
|
||||
|
||||
genRsyncOpts :: ParsedRemoteConfig -> RemoteGitConfig -> Annex [CommandParam] -> RsyncUrl -> RsyncOpts
|
||||
genRsyncOpts c gc transport url = RsyncOpts
|
||||
{ rsyncUrl = url
|
||||
|
|
Loading…
Reference in a new issue