From 3d38896717496e40e3fd6dd98edde72e12487662 Mon Sep 17 00:00:00 2001 From: han-guangyu Date: Thu, 1 Jun 2023 04:17:58 +0000 Subject: [PATCH] Suppress git output during openstack-nova-priority-feature installation/uninstallation --- openstack-nova.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/openstack-nova.spec b/openstack-nova.spec index 1273481..002b379 100644 --- a/openstack-nova.spec +++ b/openstack-nova.spec @@ -1,14 +1,16 @@ -%define gitPatch() \ -cd %1; \ +%define gitPatch() {\ +(cd %1; \ git init && git config user.name "openstack-plugin" && git config user.email "openstack-plugin"; \ git add . && git commit -m "openstack-plugin init"; \ git apply --check %2 || exit 1 && git apply %2; \ -git add . && git commit -m "openstack-plugin patch" +git add . && git commit -m "openstack-plugin patch") &> /dev/null; \ +} -%define gitUnPatch() \ -cd %1;\ -git reset --hard HEAD~;\ -rm -rf %1/.git +%define gitUnPatch() {\ +(cd %1; \ +git reset --hard HEAD~; \ +rm -rf %1/.git) &> /dev/null; \ +} %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc 0 @@ -27,7 +29,7 @@ Name: openstack-nova # Liberty semver reset # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z Version: 20.6.1 -Release: 8 +Release: 9 Summary: OpenStack Compute (nova) License: ASL 2.0 @@ -761,6 +763,9 @@ exit 0 %endif %changelog +* Thu Jun 01 2023 Han Guangyu - 20.6.1-9 +- Suppress git output during openstack-nova-priority-feature installation/uninstallation. + * Thu Nov 24 2022 wangxiyuan -20.6.1-8 - Add VM priority feature pacakge. -- Gitee