| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From 402a821e604f280e62c34bf4d40c6d1b4c6c892d Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Mon, 4 Jul 2016 20:11:33 -0700 |
| 4 | Subject: [PATCH] functions.sh: remove space at head |
| 5 | |
| 6 | The command like: |
| 7 | rpm -qp --nodigest --nosignature --qf '<foo> [%{REQUIRENAME}\n]\n' |
| 8 | ^^space |
| 9 | |
| 10 | The space will be printed, and will impact the check result, so remove it. |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/9] |
| 13 | |
| 14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 15 | --- |
| 16 | functions.sh | 2 ++ |
| 17 | 1 file changed, 2 insertions(+) |
| 18 | |
| 19 | diff --git a/functions.sh b/functions.sh |
| 20 | index 85c9003..b1069d2 100644 |
| 21 | --- a/functions.sh |
| 22 | +++ b/functions.sh |
| 23 | @@ -26,6 +26,7 @@ function trim_release_old() |
| 24 | sed -e " |
| 25 | /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g} |
| 26 | s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g |
| 27 | + s/^ *//g |
| 28 | " |
| 29 | } |
| 30 | function trim_release_new() |
| 31 | @@ -33,6 +34,7 @@ function trim_release_new() |
| 32 | sed -e " |
| 33 | /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g} |
| 34 | s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g |
| 35 | + s/^ *//g |
| 36 | " |
| 37 | } |
| 38 | # Get single directory or filename with long or short release string |
| 39 | -- |
| 40 | 2.9.0 |
| 41 | |