Merge ~jocave/checkbox-support:extra-snapctl-support into checkbox-support:master

[Jonathan Cave]

Found that snapctl can take a "-d" flag thereby ensuring a json document is always returned and avoiding the workaround in this code.

Added a snapctl set function.

[Sylvain Pineau (sylvain-pineau)]

Looks good. Thanks for the set function.

review: Approve

[Maciej Kisielewski (kissiel)]

Deduplication needed.

review: Needs Fixing

[Maciej Kisielewski (kissiel)]

Oh, and that additional newline landed here:
https://git.launchpad.net/checkbox-support/commit/?id=d0f3fad4f46adf696628a12522346173436a49a9

so this branch needs a rebase

[Sylvain Pineau (sylvain-pineau)]

Could you please rework this branch to land only https://git.launchpad.net/~jocave/checkbox-support/commit/?id=05d827b1f6c59e1524445c18205ecb2ed4f945d3 please?

review: Needs Fixing

[Jonathan Cave (jocave)]

Rebased the branch and dropped all but the changes requested by Sylvain.

review: Needs Resubmitting

[Sylvain Pineau (sylvain-pineau)]

Thank you, +1

review: Approve

diff --git a/checkbox_support/snap_utils/config.py b/checkbox_support/snap_utils/config.py
index aaa7499..53e71fc 100644
--- a/checkbox_support/snap_utils/config.py
+++ b/checkbox_support/snap_utils/config.py
@@ -63,11 +63,8 @@ def get_snapctl_config(keys):
     """Query snapctl for given keys."""
     if len(keys) == 0:
         return dict()
-    out = subprocess.check_output(['snapctl', 'get'] + keys).decode(
+    out = subprocess.check_output(['snapctl', 'get', '-d'] + keys).decode(
         sys.stdout.encoding)
-    if len(keys) == 1:
-        # snapctl returns bare string with a value when quering for one only
-        return {keys[0]: out.strip()}
     return json.loads(out)