diff options
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 031374c0fc..8891f06ffa 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -70,6 +70,26 @@ package_generate_rpm_conf () { | |||
70 | printf "\n" >> ${DEPLOY_DIR_RPM}/solvedb.macro | 70 | printf "\n" >> ${DEPLOY_DIR_RPM}/solvedb.macro |
71 | } | 71 | } |
72 | 72 | ||
73 | rpm_log_check() { | ||
74 | target="$1" | ||
75 | lf_path="$2" | ||
76 | |||
77 | lf_txt="`cat $lf_path`" | ||
78 | for keyword_die in "Cannot find package" "exit 1" ERR Fail | ||
79 | do | ||
80 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | ||
81 | then | ||
82 | echo "log_check: There were error messages in the logfile" | ||
83 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | ||
84 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | ||
85 | echo "" | ||
86 | do_exit=1 | ||
87 | fi | ||
88 | done | ||
89 | test "$do_exit" = 1 && exit 1 | ||
90 | true | ||
91 | } | ||
92 | |||
73 | python write_specfile () { | 93 | python write_specfile () { |
74 | import textwrap | 94 | import textwrap |
75 | 95 | ||