#
#
# add_dir "tests/keydir_defaults_to_under_confdir"
# 
# add_file "tests/keydir_defaults_to_under_confdir/__driver__.lua"
#  content [db751b1f1dcd84b9f88730d58adec5b871d6c207]
# 
# patch "monotone.cc"
#  from [fb3a6056cecbb09cb65bdb9b410700d06b51e62a]
#    to [611d1d85a05112ff1bc59ff2268aa8c8d3054458]
#
============================================================
--- tests/keydir_defaults_to_under_confdir/__driver__.lua	db751b1f1dcd84b9f88730d58adec5b871d6c207
+++ tests/keydir_defaults_to_under_confdir/__driver__.lua	db751b1f1dcd84b9f88730d58adec5b871d6c207
@@ -0,0 +1,15 @@
+
+mtn_setup()
+
+mkdir("foo")
+mkdir("foo/keys")
+
+check(raw_mtn("ls", "keys", "--confdir=foo", "--keydir=foo/keys"), 0, true, false)
+
+copy("stdout", "good")
+
+check(raw_mtn("ls", "keys", "--confdir=foo"), 0, {"good"}, false)
+
+check(raw_mtn("ls", "keys", "--keydir=foo/keys", "--confdir=."), 0, {"good"}, false)
+
+check(raw_mtn("ls", "keys", "--confdir=.", "--keydir=foo/keys"), 0, {"good"}, false)
============================================================
--- monotone.cc	fb3a6056cecbb09cb65bdb9b410700d06b51e62a
+++ monotone.cc	611d1d85a05112ff1bc59ff2268aa8c8d3054458
@@ -230,7 +230,7 @@ cpp_main(int argc, char ** argv)
                 app.db.set_filename(app.opts.dbname);
             }
 
-          if (app.opts.key_dir_given)
+          if (app.opts.key_dir_given || app.opts.conf_dir_given)
             {
               if (!app.opts.key_dir.empty())
                 app.keys.set_key_dir(app.opts.key_dir);