diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2017-04-26 11:38:30 +0100 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2017-04-26 11:39:35 +0100 |
| commit | 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0 (patch) | |
| tree | 1651f820644e7f5a3a7fd97743a1389adc66a162 | |
| parent | 4d5e3eab6ddd707e680ed5e466cb310c0f291a86 (diff) | |
| download | keycodemapdb-7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0.zip keycodemapdb-7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0.tar.gz keycodemapdb-7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0.tar.bz2 | |
Fix message when seeing unknown map
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rwxr-xr-x | tools/keymap-gen | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tools/keymap-gen b/tools/keymap-gen index 981768d..a10c538 100755 --- a/tools/keymap-gen +++ b/tools/keymap-gen @@ -286,11 +286,11 @@ class LanguageSrcGenerator(LanguageGenerator): def generate_code_map(self, varname, database, frommapname, tomapname): if frommapname not in database.mapfrom: - raise Exception("Unknown map %s, expected %s", - frommapname, ",".join(database.mapfrom.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + frommapname, ", ".join(database.mapfrom.keys()))) if tomapname not in database.mapto: - raise Exception("Unknown map %s, expected %s", - tomapname, ",".join(database.mapto.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + tomapname, ", ".join(database.mapto.keys()))) tolinux = database.mapfrom[frommapname] fromlinux = database.mapto[tomapname] @@ -319,8 +319,8 @@ class LanguageSrcGenerator(LanguageGenerator): def generate_code_table(self, varname, database, mapname): if mapname not in database.mapto: - raise Exception("Unknown map %s, expected %s", - mapname, ",".join(database.mapto.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + mapname, ", ".join(database.mapto.keys()))) keys = database.mapto[Database.MAP_LINUX].keys() keys.sort() @@ -340,11 +340,11 @@ class LanguageSrcGenerator(LanguageGenerator): def generate_name_map(self, varname, database, frommapname, tomapname): if frommapname not in database.mapfrom: - raise Exception("Unknown map %s, expected %s", - frommapname, ",".join(database.mapfrom.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + frommapname, ", ".join(database.mapfrom.keys()))) if tomapname not in database.mapname: - raise Exception("Unknown map %s, expected %s", - tomapname, ",".join(database.mapname.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + tomapname, ", ".join(database.mapname.keys()))) tolinux = database.mapfrom[frommapname] fromlinux = database.mapname[tomapname] @@ -374,8 +374,8 @@ class LanguageSrcGenerator(LanguageGenerator): def generate_name_table(self, varname, database, mapname): if mapname not in database.mapname: - raise Exception("Unknown map %s, expected %s", - mapname, ",".join(database.mapname.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + mapname, ", ".join(database.mapname.keys()))) keys = database.mapto[Database.MAP_LINUX].keys() keys.sort() @@ -418,8 +418,8 @@ class LanguageDocGenerator(LanguageGenerator): def generate_name_docs(self, varname, database, mapname): if mapname not in database.mapname: - raise Exception("Unknown map %s, expected %s", - mapname, ",".join(database.mapname.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + mapname, ", ".join(database.mapname.keys()))) keys = database.mapto[Database.MAP_LINUX].keys() keys.sort() @@ -440,8 +440,8 @@ class LanguageDocGenerator(LanguageGenerator): def generate_code_docs(self, varname, database, mapname): if mapname not in database.mapfrom: - raise Exception("Unknown map %s, expected %s", - mapname, ",".join(database.mapfrom.keys())) + raise Exception("Unknown map %s, expected one of %s" % ( + mapname, ", ".join(database.mapfrom.keys()))) tolinux = database.mapfrom[mapname] keys = tolinux.keys() |