[packages/rpm] - you need coreutils to cp, and in vserver build coreutils is not there yet

glen glen at pld-linux.org
Wed Oct 31 08:03:48 CET 2012


commit 6a934782151099bda5bfe15a857581d9ee40c174
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Oct 31 09:03:41 2012 +0200

    - you need coreutils to cp, and in vserver build coreutils is not there yet

 rpm.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 1e40cbb..60711d8 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1174,15 +1174,15 @@ fi
 
 %posttrans
 if [ -x %{_rpmlibdir}/bin/rpmdb_checkversion ] && \
-		! %{_rpmlibdir}/bin/rpmdb_checkversion -h /var/lib/rpm -d /var/lib/rpm ; then
-	if [ ! -e /var/lib/rpm.rpmbackup-%{version}-%{release} ] && \
-			/bin/cp -a /var/lib/rpm /var/lib/rpm.rpmbackup-%{version}-%{release} ; then
+		! %{_rpmlibdir}/bin/rpmdb_checkversion -h /var/lib/rpm -d /var/lib/rpm; then
+	if [ ! -e /var/lib/rpm.rpmbackup-%{version}-%{release} ] && [ -x /bin/cp ] && \
+			/bin/cp -a /var/lib/rpm /var/lib/rpm.rpmbackup-%{version}-%{release}; then
 		echo
 		echo "Backup of the rpm database has been created in /var/lib/rpm.rpmbackup-%{version}-%{release}"
 		echo
 	fi
 	if [ -x %{_rpmlibdir}/bin/dbconvert ]; then
-		if ! %{_rpmlibdir}/bin/dbconvert --rebuilddb ; then
+		if ! %{_rpmlibdir}/bin/dbconvert --rebuilddb; then
 			echo
 			echo "rpm database conversion failed!"
 			echo "You have to run  %{_rpmlibdir}/bin/dbconvert manually"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/6a934782151099bda5bfe15a857581d9ee40c174



More information about the pld-cvs-commit mailing list