implement ElektraInitiative#2561 for kdb set

dev2718 · Aug 25, 2021 · 39b70d6 · 39b70d6
1 parent a888a13
commit 39b70d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/tools/kdb/cmdline.cpp b/src/tools/kdb/cmdline.cpp
@@ -544,6 +544,10 @@ kdb::Key Cmdline::createKey (int pos, bool allowCascading) const
 	{
 		root = prependNamespace (root, ns);
 	}
+	else if (!root.isCascading () && !ns.empty ())
+	{
+		throw invalid_argument ("Cannot use the -N option with a key that already has a namespace.");
+	}
 
 	if (!root.isValid ())
 	{

diff --git a/src/tools/kdb/set.cpp b/src/tools/kdb/set.cpp
@@ -34,11 +34,12 @@ int SetCommand::execute (Cmdline const & cl)
 	KeySet conf;
 	Key k = cl.createKey (0);
 	std::string name = k.getName ();
+	Key parentKey = cl.getParentKey (k);
 
 	// do not resume on any get errors
 	// otherwise the user might break
 	// the config
-	kdb.get (conf, k);
+	kdb.get (conf, parentKey);
 
 	bool cascadingWrite = name[0] == '/';
 
@@ -70,9 +71,9 @@ int SetCommand::execute (Cmdline const & cl)
 		toprint << "Set string to \"" << value << '"' << endl;
 		key.setString (value);
 	}
-	kdb.set (conf, k);
-	printWarnings (cerr, k, cl.verbose, cl.debug);
-	printError (cerr, k, cl.verbose, cl.debug);
+	kdb.set (conf, parentKey);
+	printWarnings (cerr, parentKey, cl.verbose, cl.debug);
+	printError (cerr, parentKey, cl.verbose, cl.debug);
 
 	if (cascadingWrite) toprint << "Using name " << key.getName () << std::endl;
 	if (!cl.quiet) cout << toprint.str ();

diff --git a/src/tools/kdb/set.hpp b/src/tools/kdb/set.hpp
@@ -23,7 +23,7 @@ class SetCommand : public Command
 
 	virtual std::string getShortOptions () override
 	{
-		return "qN";
+		return "qNf";
 	}
 
 	virtual std::string getSynopsis () override