[PATCH 0/3] Minor improvements found while packaging

[Felix Moessbauer]

Hi,

while packaging the new release for Debian I found a couple of minor
things that should be corrected. Nothing serious or calling for a
point release.

Best regards,
Felix

Felix Moessbauer (3):
kas: improve printing of os version
diff: use correct spelling of kas
kas-container: add diff subcommand to usage

kas-container | 1 +
kas/kas.py | 3 ++-
kas/plugins/diff.py | 8 ++++----
3 files changed, 7 insertions(+), 5 deletions(-)

--
2.51.0

[Felix Moessbauer]

When running on a distribution release without a version (like debian
sid / testing), the distro.version() is 'n/a'. This gives no information
about the version actually using.

To mitigate this, we print the codename instead of the version and only
if that does not exist, fallback to the version.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---
kas/kas.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kas/kas.py b/kas/kas.py
index c613dc4f1..0fffaa3ed 100644
--- a/kas/kas.py
+++ b/kas/kas.py
@@ -205,7 +205,8 @@ def kas(argv):
set_global_loglevel(args.log_level.upper())

logging.info('%s %s started on %s %s', os.path.basename(sys.argv[0]),
- __version__, distro.name(), distro.version())
+ __version__, distro.name(),
+ distro.codename() or distro.version())

loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
--
2.51.0

[Felix Moessbauer]

The diff command is already supported, but not documented in the usage
documentation. Add it.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---

kas-container | 1 +
1 file changed, 1 insertion(+)

diff --git a/kas-container b/kas-container
index f830312d5..7ee6d2011 100755
--- a/kas-container
+++ b/kas-container
@@ -49,6 +49,7 @@ usage()
printf "%b" "\nPositional arguments:\n"
printf "%b" "build\t\t\tCheck out repositories and build target.\n"
printf "%b" "checkout\t\tCheck out repositories but do not build.\n"
+ printf "%b" "diff\t\t\tCompare two kas configurations.\n"
printf "%b" "dump\t\t\tCheck out repositories and write flat version\n"
printf "%b" " \t\t\tof config to stdout.\n"
printf "%b" "lock\t\t\tCreate and update kas project lockfiles\n"
--
2.51.0

[Felix Moessbauer]

We spell the project name as 'kas' (instead of 'KAS') throughout
the project. By that, we fix the spelling in diff.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---

kas/plugins/diff.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kas/plugins/diff.py b/kas/plugins/diff.py
index 76e0fc3c2..aad48bc87 100644
--- a/kas/plugins/diff.py
+++ b/kas/plugins/diff.py
@@ -22,7 +22,7 @@
"""
This plugin implements the ``kas diff`` command.

- This plugin compares two KAS configurations and outputs the
+ This plugin compares two kas configurations and outputs the
differences. The diff includes both content differences in
the configuration files and repository differences if commit
IDs or tags have changed.
@@ -53,7 +53,7 @@ class Diff:

name = 'diff'
helpmsg = (
- 'Compare two KAS configurations.'
+ 'Compare two kas configurations.'
)

@classmethod
@@ -78,13 +78,13 @@ class Diff:
parser.add_argument('--commit-only',
action='store_true',
help='This will not display the differences in '
- 'the KAS configurations; it will only list '
+ 'the kas configurations; it will only list '
'commits resulting from different '
'repository revisions.')
parser.add_argument('--content-only',
action='store_true',
help='This will only display the differences in '
- 'the KAS configurations and will not '
+ 'the kas configurations and will not '
'include repository differences.')

@staticmethod
--
2.51.0

[Jan Kiszka]

Thanks, applied.

Jan

--
Siemens AG, Foundational Technologies
Linux Expert Center