ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/cms-common.spec
(Generate patch)

Comparing COMP/CMSDIST/cms-common.spec (file contents):
Revision 1.6 by elmer, Mon Feb 4 07:10:20 2008 UTC vs.
Revision 1.8 by muzaffar, Tue Feb 5 17:36:37 2008 UTC

# Line 157 | Line 157 | if [ "X$SCRAM_VERSION" = "X" ] ; then
157    done
158    if [ -f ${dir}/config/scram_version ] ; then
159      ver=`cat ${dir}/config/scram_version`
160 +    if [ "X$ver" = "XV1_0_3-p1" ] ; then
161 +      if [ "X$CMSARCH" = "Xslc4_ia32_gcc345" ] ; then
162 +        ver=V1_0_3-p2
163 +      fi
164 +    fi
165      case $ver in
166        V0_* ) srbase=lcg/SCRAM/${ver};;
167        * ) srbase=lcg/SCRAMV1/${ver};;
# Line 166 | Line 171 | if [ "X$SCRAM_VERSION" = "X" ] ; then
171      fi
172    fi
173   else
174 +   if [ "X$SCRAM_VERSION" = "XV1_0_3-p1" ] ; then
175 +     if [ "X$CMSARCH" = "Xslc4_ia32_gcc345" ] ; then
176 +       SCRAM_VERSION=V1_0_3-p2
177 +     fi
178 +   fi
179     sver=$SCRAM_VERSION
180   fi
181   scmd=scram
# Line 174 | Line 184 | case $sver in
184    V1_0* ) srbase=lcg/SCRAMV1/${sver}; scmd=scramv1;;
185    * ) srbase=lcg/SCRAMV1/${sver};;
186   esac
187 + if [ ! -f %{instroot}/$CMSARCH/${srbase}/etc/profile.d/init.sh ] ; then
188 +  echo "Unable to find SCRAM version $sver for $CMSARCH architecture."
189 +  exit 1
190 + fi
191   source %{instroot}/$CMSARCH/${srbase}/etc/profile.d/init.sh
192   # In the case we are on linux ia32 we prepend the linux32 command to the
193   # actual scram command so that, no matter where the ia32 architecture is

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines