[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] packages/rpm/rhel-4/find-osrel fixes for RHEL4

From: Anil A. Pal <apal_at_yahoo-inc.com>
Date: 2007-08-29 22:58:44 CEST

This is a fix I found necessary to build from sources on my RHEL4
system. There are two fixes here:

1) Adding redhat-release-4* (and redhat-release-5*) to the list of
redhat-release versions. This is based on thsi system:

> apal@pkgbuild5:apal-subversion: rpm -q redhat-release
> redhat-release-4AS-2
> apal@pkgbuild5:apal-subversion: uname -a
> Linux pkgbuild5.corp.yahoo.com 2.6.9-5.EL #1 Wed Jan 5 19:22:18 EST 2005 i686

The second fix is for systems (like this) that do not have a
centos-release rpm installed - without this patch the script would error
out thus:

> apal@pkgbuild5:apal-subversion: if [ `rpm -q centos-release` ] ; then
> echo ok
> else
> echo notok
> fi
>
> bash: [: too many arguments
> notok

Path inline per http://subversion.tigris.org/faq.html#patch

Index: packages/rpm/rhel-4/find-osrel
===================================================================
--- packages/rpm/rhel-4/find-osrel (revision 26265)
+++ packages/rpm/rhel-4/find-osrel (working copy)
@@ -11,7 +11,7 @@
       *) echo Unknown;;
     esac
  elif [ -f /etc/redhat-release ]; then
- if [ `rpm -q centos-release` ]; then
+ if rpm -q centos-release > /dev/null; then
       case `rpm -q centos-release` in
         centos-release-3*) echo rhel3;;
         centos-release-4*) echo rhel4;;
@@ -19,6 +19,8 @@
       esac
     else
       case `rpm -q redhat-release` in
+ redhat-release-4*) echo rhel4;;
+ redhat-release-5*) echo rhel5;;
         redhat-release-7*) echo rh7x;;
         redhat-release-8*) echo rh80;;
         redhat-release-9-*) echo rh90;;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 30 11:03:45 2007

This is an archived mail posted to the Subversion Dev mailing list.