Commit dedf977d authored by John Johansen's avatar John Johansen

Merge branch 'cboltz-ignore-orig-rej' into 'master'

Ignore *.orig and *.rej files when loading profiles

This was "accidently" reported by Ralph on the opensuse-support

I propose this for 2.10..master (I verified that 2.10 tools and libapparmor have *.orig and *.rej in the ignore list)

PR: !282Acked-by: 's avatarJohn Johansen <>
parents 99d18654 228b92ce
Pipeline #39412334 passed with stages
in 10 minutes and 8 seconds
......@@ -83,6 +83,8 @@ skip_profile() {
local profile=$1
if [ "${profile%.rpmnew}" != "${profile}" -o \
"${profile%.rpmsave}" != "${profile}" -o \
"${profile%.orig}" != "${profile}" -o \
"${profile%.rej}" != "${profile}" -o \
-e "${PROFILE_DIR}/disable/`basename ${profile}`" -o \
"${profile%\~}" != "${profile}" ] ; then
return 1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment