!8 [sync] PR-6: add -h option to scl command

From: @openeuler-sync-bot
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-10-13 09:39:19 +00:00 committed by Gitee
commit 0a658a05bc
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 09116bb68bb76c9f6432511f5a0f054a2e3b92e0 Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Tue, 12 Oct 2021 19:47:01 +0800
Subject: [PATCH] add -h option to scl-command
---
src/scl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/scl.c b/src/scl.c
index df8111a..1c7854a 100644
--- a/src/scl.c
+++ b/src/scl.c
@@ -25,7 +25,7 @@ static void print_usage( const char *name ) {
fprintf(stderr, " %s load|unload [<collection>...]\n", basename(name));
fprintf(stderr, " %s list-collections\n", basename(name));
fprintf(stderr, " %s list-packages|man|register|deregister <collection>\n", basename(name));
- fprintf(stderr, " %s --help\n\n", basename(name));
+ fprintf(stderr, " %s -h|--help\n\n", basename(name));
fprintf(stderr,
"description:\n"
@@ -36,7 +36,7 @@ static void print_usage( const char *name ) {
" list-packages list packages in Software Collection\n"
" man show manual page about Software Collection\n"
" register|deregister register/deregister Software Collection\n"
- " --help show this help\n"
+ " -h|--help show this help\n"
"\nUse '-' as <command> to read the command from standard input.\n");
}
--
2.27.0

View File

@ -3,7 +3,7 @@
Name: scl-utils
Epoch: 1
Version: 2.0.2
Release: 2
Release: 3
Summary: Utilities for alternative packaging
License: GPLv2+
URL: https://github.com/sclorg/scl-utils
@ -16,6 +16,7 @@ Requires: %{_bindir}/modulecmd
Patch1: 0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch
Patch100: scl-utils-2.0.2-rhbz-1728450.patch
Patch101: fix-direct-scl_source-help-output.patch
Patch102: add-h-option-to-scl-command.patch
%description
Run-time utility for alternative packaging.
@ -70,6 +71,9 @@ ln -s prefixes conf
%{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog
* Tue Oct 12 2021 caodongxia <caodongxia@huawei.com> - 2.0.2-3
- add -h option to scl command
* Fri Oct 08 2021 wangyue <wangyue92@huawei.com> - 2.0.2-2
- fix direct scl_source --help output