Commit b861fc83 authored by Dave Loper's avatar Dave Loper

Fix issue with extra dot in sed replace to remove DNSmasq from filter. See:...

Fix issue with extra dot in sed replace to remove DNSmasq from filter. See: clearos/upstream/centos/dnsmasq#2
parent c6861033
Pipeline #77186006 canceled with stages
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
$app['basename'] = 'base'; $app['basename'] = 'base';
$app['version'] = '2.7.5'; $app['version'] = '2.7.6';
$app['vendor'] = 'ClearFoundation'; $app['vendor'] = 'ClearFoundation';
$app['packager'] = 'ClearFoundation'; $app['packager'] = 'ClearFoundation';
$app['license'] = 'GPLv3'; $app['license'] = 'GPLv3';
......
...@@ -181,6 +181,10 @@ for REPO_FILE in $REPO_FILES; do ...@@ -181,6 +181,10 @@ for REPO_FILE in $REPO_FILES; do
for PACKAGE in $EXCLUDES; do for PACKAGE in $EXCLUDES; do
CHECK=`grep "^exclude=.*$PACKAGE " $REPO_DIR/$REPO_FILE` CHECK=`grep "^exclude=.*$PACKAGE " $REPO_DIR/$REPO_FILE`
if [ -n "$CHECK" ]; then if [ -n "$CHECK" ]; then
LC=$(echo ${PACKAGE: -1})
if [ "$LC" = "." ]; then
PACKAGE="${PACKAGE::-1}"
fi
logger -p local6.notice -t installer "app-base - removing the following from yum exclude: $REPO_FILE / $PACKAGE*" logger -p local6.notice -t installer "app-base - removing the following from yum exclude: $REPO_FILE / $PACKAGE*"
sed -i -e "s/$PACKAGE\* //" $REPO_DIR/$REPO_FILE sed -i -e "s/$PACKAGE\* //" $REPO_DIR/$REPO_FILE
fi fi
......
Name: app-base Name: app-base
Epoch: 1 Epoch: 1
Version: 2.7.5 Version: 2.7.6
Release: 1%{dist} Release: 1%{dist}
Summary: General Settings Summary: General Settings
License: GPLv3 License: GPLv3
......
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