summaryrefslogtreecommitdiff
path: root/pkg/config/yaml.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/config/yaml.go')
-rw-r--r--pkg/config/yaml.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go
index e8dc401..1afba0a 100644
--- a/pkg/config/yaml.go
+++ b/pkg/config/yaml.go
@@ -86,10 +86,10 @@ func (cfg *Config) fixGlobalOptions(unparsed Map) {
newOpts, _ := buildOptions(&cfg.FeedOptions, unparsed)
- for k := range origMap {
+ for k, v := range origMap {
if _, ok := unparsed[k]; !ok {
log.Warnf("Global option '%s' should be inside the 'options' map. It currently overwrites the same key there.", k)
- } else {
+ } else if !handleDeprecated(k, v, "", &cfg.GlobalOptions, &newOpts) {
log.Warnf("Unknown global option '%s'. Ignored!", k)
}
}
@@ -199,7 +199,9 @@ func buildFeeds(cfg []configGroupFeed, target []string, feeds Feeds, globalFeedO
opt, unknown := buildOptions(globalFeedOptions, f.Options)
for _, optName := range unknown {
- log.Warnf("Unknown option '%s' for feed '%s'. Ignored!", optName, name)
+ if !handleDeprecated(optName, f.Options[optName], name, nil, &opt) {
+ log.Warnf("Unknown option '%s' for feed '%s'. Ignored!", optName, name)
+ }
}
feedCopy.Options = opt
class='nohover-highlight'> 2014-04-17move/copy: always reencrypt passwords at destinationJason A. Donenfeld5-25/+56 2014-04-17makefile: allow platform files with gnu sedJason A. Donenfeld1-7/+8 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-04-17mv: Add pass mv/rename supportJason A. Donenfeld5-3/+78 Based-on-work-by: Matthieu Weber <mweber@free.fr> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-04-17revelation2pass: add plain XML importJavali1-11/+15 I found that revelatio2pass.py script doesn't work. It can not decrypt my password file. I got following error message: raceback (most recent call last): File "git/password-store/contrib/importers/revelation2pass.py", line 159, in <module> main(args.FILE, verbose=args.verbose, xml=args.xml) File "git/password-store/contrib/importers/revelation2pass.py", line 140, in main cleardata_gz = decrypt_gz(password, data) File "git/password-store/contrib/importers/revelation2pass.py", line 117, in decrypt_gz ct = c.decrypt(cipher_text[28:]) File "/usr/lib/python2.7/site-packages/Crypto/Cipher/blockalgo.py", line 295, in decrypt return self._cipher.decrypt(ciphertext) I was unable to fix the problem, but I created a workaround, that add plain XML import option to the revelation2pass.py script. Revelation can export its password file as plain XML format. 2014-04-17platform: add cygwin supportJason A. Donenfeld2-1/+17 According to Brandon Jones, all we need to do is adjust /dev/clipboard from xclip. So we add a platform specific file to do so. http://www.relaytheurgency.com/2014/04/pass-in-cygwin-relatively-simple.html Suggested-by: Brandon Jones <jones.brandon.lee@gmail.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>