diff --git a/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch b/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch index 2354f1d..446ce18 100644 --- a/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch +++ b/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch @@ -1,4 +1,4 @@ -From d2210b5edbac23d59c8789c6020f9f850be503c4 Mon Sep 17 00:00:00 2001 +From c4b4aa2c79dc801311af6483079e6cb6a84d0919 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 28 Oct 2020 15:20:04 -0400 Subject: [PATCH] slog_common_event: Allow --help and --version even on @@ -6,20 +6,19 @@ Subject: [PATCH] slog_common_event: Allow --help and --version even on Signed-off-by: Stephen Gallagher --- - src/slog_common_event.c | 25 +++++++++++++------------ - 1 file changed, 13 insertions(+), 12 deletions(-) + src/slog_common_event.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/slog_common_event.c b/src/slog_common_event.c -index d7409e8fa34e2c95210d18c0939844a4ed091a8b..cc91e7babdbaaff7b2cf51998b4f6dca1b8d04da 100644 +index a034511635a993330154578632b0824cbacddf18..970551cc9cf953e08a09309e655056f41152b50e 100644 --- a/src/slog_common_event.c +++ b/src/slog_common_event.c -@@ -77,22 +77,10 @@ main(int argc, char **argv) { +@@ -77,20 +77,10 @@ main(int argc, char **argv) { char *e=NULL, *s=NULL, *d=NULL, *l=NULL; char desc[1024]; servicelog *slog; struct sl_event event; uint64_t event_id; --#ifndef SERVICELOG_TEST - int platform = 0; - - platform = get_platform(); @@ -30,19 +29,17 @@ index d7409e8fa34e2c95210d18c0939844a4ed091a8b..cc91e7babdbaaff7b2cf51998b4f6dca - argv[0], __power_platform_name(platform)); - exit(1); - } --#endif for (;;) { option_index = 0; rc = getopt_long(argc, argv, "e:t:s:d:l:hvV", long_options, &option_index); -@@ -137,10 +125,23 @@ main(int argc, char **argv) { +@@ -135,10 +125,21 @@ main(int argc, char **argv) { "(%s).\n", PACKAGE_BUGREPORT); exit(1); } } -+#ifndef SERVICELOG_TEST + int platform = 0; + + platform = get_platform(); @@ -53,7 +50,6 @@ index d7409e8fa34e2c95210d18c0939844a4ed091a8b..cc91e7babdbaaff7b2cf51998b4f6dca + argv[0], __power_platform_name(platform)); + exit(1); + } -+#endif + if (e == NULL) { if (verbose) { diff --git a/servicelog.spec b/servicelog.spec index cc2c6a7..1fd70c9 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -25,6 +25,7 @@ of service operations that have been performed on the system. %prep %setup -q +%patch0001 -p1 %build autoreconf -fiv