Skip to content

Commit 7bf892e

Browse files
committed
latest-config: improve script on error when determining latestver
1 parent a1e28f6 commit 7bf892e

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

get-fedora-latest-config

+10-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ fi
99

1010
exit_clean() {
1111
local exit_code=$?
12-
rm -rf "$tmpdir"
12+
if [ -n "$tmpdir" ]; then
13+
rm -rf "$tmpdir"
14+
fi
15+
if [ ${exit_code} != 0 ]; then
16+
errecho "Unable to find the latest kernel rpm for Fedora $releasever";
17+
fi
1318
exit "${exit_code}"
1419
}
1520

@@ -79,6 +84,8 @@ if [ ! -e "$localdir/$kernelarchive" ]; then
7984
exit 1
8085
fi
8186

87+
trap 'exit_clean' 0 1 2 3 6 15
88+
8289
releasever=$(get_releasever "$releasever")
8390

8491
# get the latest kernel rpm
@@ -104,10 +111,8 @@ if [ "$releasever" == 'rawhide' ]; then
104111
releasever="$(echo "$latestver" | grep -o "fc[1-9][0-9]" | sed 's/fc//')"
105112
fi
106113

107-
if [ "x$latestrpm" != "x" ] && [ "x$releasever" != "x" ]; then
114+
if [ -n "$latestrpm" ] && [ -n "$releasever" ]; then
108115
key="$localdir/../builder-rpm/keys/RPM-GPG-KEY-fedora-$releasever-primary"
109-
110-
trap 'exit_clean' 0 1 2 3 6 15
111116
tmpdir="$(mktemp -d -p "$localdir")"
112117
# download latest kernel rpm
113118
# shellcheck disable=SC2086
@@ -143,7 +148,6 @@ if [ "x$latestrpm" != "x" ] && [ "x$releasever" != "x" ]; then
143148
# Only modification is \`yes '' | make oldconfig\` to drop config settings which
144149
# depend on Fedora patches and adjust for the small version difference.
145150
EOF
146-
rm -rf "$tmpdir"
147151
else
148-
errecho "Unable to find the latest kernel rpm for Fedora $releasever"; exit 1
152+
exit 1
149153
fi

0 commit comments

Comments
 (0)