Magellan Linux

Diff of /trunk/mage-buildserver/buildserver-upload-smage.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2770 by niro, Thu Aug 28 09:01:36 2014 UTC revision 2771 by niro, Thu Aug 28 09:04:24 2014 UTC
# Line 71  die() Line 71  die()
71  load_mage_features  load_mage_features
72  mage_setup  mage_setup
73    
74  if [ -f /var/cache/mage/smage/${SMAGEFILE} ]  if [ -f ${SMAGESCRIPTSDIR}/${SMAGEFILE} ]
75  then  then
76   smagesource /var/cache/mage/smage/${SMAGEFILE}   smagesource ${SMAGESCRIPTSDIR}/${SMAGEFILE}
77  else  else
78   die "smagefile '/var/cache/mage/smage/${SMAGEFILE}' not found."   die "smagefile '${SMAGESCRIPTSDIR}/${SMAGEFILE}' not found."
79  fi  fi
80    
81  if [[ ${BUILD_ARCH} = src ]]  if [[ ${BUILD_ARCH} = src ]]
# Line 101  else Line 101  else
101   export PNAME="${subpackage}"   export PNAME="${subpackage}"
102   split_info_${PNAME}   split_info_${PNAME}
103    
104   TARGET_PKGFILE+=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )   TARGET_PKGFILE+=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
105    
106   # restore smage environment   # restore smage environment
107   split_restore_variables   split_restore_variables
# Line 109  else Line 109  else
109   # unset all saved smage variables   # unset all saved smage variables
110   split_unset_variables   split_unset_variables
111   else   else
112   TARGET_PKGFILE=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )   TARGET_PKGFILE=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
113   fi   fi
114    
115   for i in ${TARGET_PKGFILE}   for i in ${TARGET_PKGFILE}

Legend:
Removed from v.2770  
changed lines
  Added in v.2771