Changeset 8935

Timestamp:

10/01/09 09:15:46 (3 years ago)

Author:

davidm

Message:

Don't install packages which are already installed

Location:

packaging/centuryegg

Files:

• install-expat-rpm (modified) (1 diff)
• install-libxml-rpm (modified) (1 diff)
• install-python-rpm (modified) (2 diffs)

packaging/centuryegg/install-expat-rpm

@@ -1 +1 @@
 #!/bin/bash
-sudo rpm -Uvh ~/rpmbuild/RPMS/*/expat-*1.95.8*.rpm
+if [ "x`rpm -qa expat | grep 1.95.8`" == "x" ]
+then
+    sudo rpm -Uvh ~/rpmbuild/RPMS/*/expat-*1.95.8*.rpm
+fi

packaging/centuryegg/install-libxml-rpm

@@ -1 +1 @@
 #!/bin/bash
-sudo rpm -Uvh ~/rpmbuild/RPMS/*/libxml2-*2.6.26*.rpm
+if [ "x`rpm -qa libxml | grep 2.6.26`" == "x" ]
+then
+    sudo rpm -Uvh ~/rpmbuild/RPMS/*/libxml2-*2.6.26*.rpm
+fi

packaging/centuryegg/install-python-rpm

@@ -1 +1 @@
 #!/bin/bash
 # sudo yum -y localinstall ~/rpmbuild/RPMS/*/python25{,-libs,-devel}-2.5*.rpm
-sudo rpm -Uvh ~/rpmbuild/RPMS/*/python25{,-libs,-devel}-2.5*.rpm
-sudo yum -y install yum-utils
+if [ "x`rpm -qa python25-devel | grep 2.5`" == "x" ]
+then
+    sudo rpm -Uvh ~/rpmbuild/RPMS/*/python25{,-libs,-devel}-2.5*.rpm
+fi
+if [ "x`rpm -qa yum-utils`" == "x" ]
+then
+    sudo yum -y install yum-utils
+fi
 if [ `yumdownloader --help | grep enablerepo | wc -l` -gt 0 ]
 then
@@ -18 +24 @@
 spectool -g -R  $HOME/rpmbuild/SPECS/python-setuptools.spec
 rpmbuild -ba --define="__python `which python25`" $HOME/rpmbuild/SPECS/python-setuptools.spec > logs/build-python-setuptools.log 2>&1 
-sudo rpm -Uvh ~/rpmbuild/RPMS/*/python25-setuptools*.rpm
+if [ "x`rpm -qa python25-setuptools`" == "x" ]
+then
+    sudo rpm -Uvh ~/rpmbuild/RPMS/*/python25-setuptools*.rpm
+fi