OSSP CVS Repository

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

Check-in Number: 6025
Date: 2009-Nov-23 22:55:23 (local)
2009-Nov-23 21:55:23 (UTC)
User:rse
Branch:
Comment: reduce platform version M.N.R to M.N also on Linux platforms (like Debian 5.0.3)
Tickets:
Inspections:
Files:
ossp-pkg/shtool/ChangeLog      1.243 -> 1.244     4 inserted, 0 deleted
ossp-pkg/shtool/sh.platform      1.30 -> 1.31     1 inserted, 1 deleted

ossp-pkg/shtool/ChangeLog 1.243 -> 1.244

--- ChangeLog    2008/12/23 19:12:05     1.243
+++ ChangeLog    2009/11/23 21:55:23     1.244
@@ -11,6 +11,10 @@
 
  Changes between 2.0.8 and 2.0.9 (18-Jul-2008 to xx-XXX-2008):
 
+   *) Reduce "shtool platform" version M.N.R to M.N also on Linux
+      platforms (like Debian 5.0.3)
+      [Ralf S. Engelschall]
+
    *) Fix "mkln -s /foo /foo/bar" (achieving a "bar -> ." symlink)
       [Ralf S. Engelschall]
 


ossp-pkg/shtool/sh.platform 1.30 -> 1.31

--- sh.platform  2008/04/02 20:13:44     1.30
+++ sh.platform  2009/11/23 21:55:23     1.31
@@ -239,7 +239,7 @@
                 n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e 's/[_-]version$//'`
                 v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep '[0-9]' | sed -e 'q' |\
                    sed -e 's/^/#/' \
-                       -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
+                       -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\).*$/\1[\2]/' \
                        -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
                        -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
                        -e 's/^#.*$//'`

CVSTrac 2.0.1