OSSP CVS Repository

ossp - Check-in [5951]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5951
Date: 2007-Jun-04 21:42:11 (local)
2007-Jun-04 19:42:11 (UTC)
User:rse
Branch:
Comment: Detect CentOS as a RHEL clone instead of a RHL clone.
Tickets:
Inspections:
Files:
ossp-pkg/shtool/ChangeLog      1.234 -> 1.235     3 inserted, 0 deleted
ossp-pkg/shtool/sh.platform      1.21 -> 1.22     1 inserted, 1 deleted

ossp-pkg/shtool/ChangeLog 1.234 -> 1.235

--- ChangeLog    2007/06/04 07:58:50     1.234
+++ ChangeLog    2007/06/04 19:42:11     1.235
@@ -11,6 +11,9 @@
 
  Changes between 2.0.7 and 2.0.8 (19-May-2007 to xx-XXX-2007):
 
+   *) Detect CentOS as a RHEL clone instead of a RHL clone.
+      [Ralf S. Engelschall]
+
    *) Improved Mac OS X detection in "shtool plaform".
       [Ralf S. Engelschall]
 


ossp-pkg/shtool/sh.platform 1.21 -> 1.22

--- sh.platform  2007/06/04 16:22:40     1.21
+++ sh.platform  2007/06/04 19:42:11     1.22
@@ -229,7 +229,7 @@
                        -e 's/^#.*$//'`
                 case "`util_lower ${n}`" in
                     redhat )
-                        if [ ".`grep 'Red Hat Enterprise Linux' /etc/${tagfile}`" != . ]; then
+                        if [ ".`egrep '(Red Hat Enterprise Linux|CentOS)' /etc/${tagfile}`" != . ]; then
                             n="<R>ed <H>at <E>nterprise <L>inux"
                         else
                             n="<R>ed <H>at <L>inux"

CVSTrac 2.0.1