From b2d5f512d29933043821f7707eefd769d2bf0ef2 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 10 Jan 2008 11:49:49 +0000
Subject: [PATCH] yum-arch is not supported on recent fedoras
---
plc.d/packages | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/plc.d/packages b/plc.d/packages
index c8df19a..69564d5 100755
--- a/plc.d/packages
+++ b/plc.d/packages
@@ -44,9 +44,9 @@ case "$1" in
createrepo=0
# Create a stamp once the package gets signed
- mkdir $repository/signed-stamps
+ mkdir $repository/signed-stamps 2> /dev/null
- for package in $repository/*/*.rpm ; do
+ for package in $(find $repository/ -name '*.rpm') ; do
stamp=$repository/signed-stamps/$(basename $package).signed
# If package is newer than signature stamp
if [ $package -nt $stamp ] ; then
@@ -79,18 +79,22 @@ case "$1" in
# .oldheaders and .olddata directories accidentally.
rm -rf $repository/{.oldheaders,.olddata}
+ type -p yum-arch > /dev/null && have_yum_arch="true"
+
# Old command is yum-arch
- if [ $yum_arch -eq 1 ] ; then
- yum-arch $repository | tr '\r' '\n' | grep -v '^ *$'
+ if [ -n "$have_yum_arch" -a $yum_arch -eq 1 ] ; then
+ yum-arch $repository
check
fi
+ type -p createrepo > /dev/null && have_createrepo="true"
+
# New command is createrepo
- if [ $createrepo -eq 1 ] ; then
+ if [ -n "$have_createrepo" -a $createrepo -eq 1 ] ; then
if [ -f $repository/yumgroups.xml ] ; then
- createrepo -g yumgroups.xml $repository | tr '\r' '\n' | grep -v '^ *$'
+ createrepo --quiet -g yumgroups.xml $repository
else
- createrepo $repository | tr '\r' '\n' | grep -v '^ *$'
+ createrepo --quiet $repository
fi
check
fi
--
2.47.0