Magellan Linux

Diff of /branches/mage-next/src/smage2.in

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

trunk/mage/usr/lib/mage/smage2.sh revision 1640 by niro, Fri Jan 13 18:29:52 2012 UTC branches/mage-next/src/smage2.in revision 2614 by niro, Tue Mar 4 15:27:52 2014 UTC
# Line 18  source ${MAGERC} Line 18  source ${MAGERC}
18  source ${MLIBDIR}/mage4.functions.sh  source ${MLIBDIR}/mage4.functions.sh
19  source ${MLIBDIR}/smage2.functions.sh  source ${MLIBDIR}/smage2.functions.sh
20    
21    # export default path
22    export PATH="${PATH}:${MLIBDIR}"
23    
24  ## setup ##  ## setup ##
25  SMAGENAME="$1"  SMAGENAME="$1"
 SMAGEVERSION="$(< ${MLIBDIR}/version)"  
26    
27  # expand PKGDIR, BUILDDIR and BINDIR with MROOT  # expand PKGDIR, BUILDDIR and BINDIR with MROOT
28  if [[ -n ${MROOT} ]]  if [[ -n ${MROOT} ]]
# Line 34  fi Line 36  fi
36  showversion  showversion
37  echo  echo
38    
39  if [ -z "$1" ]  if [[ -z ${SMAGENAME} ]]
40  then  then
41   echo "No .smage2 file given. Exiting."   echo "No .smage2 file given. Exiting."
42   echo   echo
# Line 154  then Line 156  then
156    
157   regen_mage_tree   regen_mage_tree
158    
  # build several targets  
  if [[ -n ${MAGE_TARGETS} ]]  
  then  
  for target in ${MAGE_TARGETS}  
  do  
  # build md5sum for existing packages  
  generate_package_md5sum \  
  --pcat "${PCATEGORIE}" \  
  --pname "${PNAME}" \  
  --pver "${PVER}" \  
  --pbuild "${PBUILD}" \  
  --parch "${ARCH}" \  
  --target "${target}"  
  done  
   
159   # build several subpackages   # build several subpackages
160   elif [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
161   then   then
162   split_save_variables   split_save_variables
163   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
# Line 178  then Line 165  then
165   # get the right variables for the split   # get the right variables for the split
166   export PNAME="${subpackage}"   export PNAME="${subpackage}"
167   split_info_${subpackage}   split_info_${subpackage}
168     # fix PCATEGORIE -> PCAT
169     if [[ ! -z ${PCATEGORIE} ]]
170     then
171     PCAT="${PCATEGORIE}"
172     unset PCATEGORIE
173     fi
174   # build md5sum for existing packages   # build md5sum for existing packages
175   generate_package_md5sum \   generate_package_md5sum \
176   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
177   --pname "${PNAME}" \   --pname "${PNAME}" \
178   --pver "${PVER}" \   --pver "${PVER}" \
179   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
# Line 194  then Line 187  then
187   else   else
188   # build md5sum for existing packages   # build md5sum for existing packages
189   generate_package_md5sum \   generate_package_md5sum \
190   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
191   --pname "${PNAME}" \   --pname "${PNAME}" \
192   --pver "${PVER}" \   --pver "${PVER}" \
193   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
# Line 267  fi Line 260  fi
260  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
261    
262  smagesource ${SMAGENAME} || die "source failed"  smagesource ${SMAGENAME} || die "source failed"
263  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"  PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"
264  MD5DIR="$(dirname ${SMAGENAME})/md5"  MD5DIR="$(dirname ${SMAGENAME})/md5"
265  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
266    
267  xtitle "Compiling ${PKGNAME}"  xtitle "Compiling ${PKGNAME}"
268  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
269    
 # auto regen mage tree if requested  
 regen_mage_tree  
   
270  if mqueryfeature "srcpkgbuild"  if mqueryfeature "srcpkgbuild"
271  then  then
272   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
# Line 312  export MAKEOPTS="${MAKEOPTS}" || die "MA Line 302  export MAKEOPTS="${MAKEOPTS}" || die "MA
302  # setup for distcc goes *before* ccache, so ccache comes before distcc in path  # setup for distcc goes *before* ccache, so ccache comes before distcc in path
303  mqueryfeature "distcc" && setup_distcc_environment  mqueryfeature "distcc" && setup_distcc_environment
304    
305    # setup icecc
306    # setup for icecc goes *before* ccache, so ccache comes before icecc in path
307    mqueryfeature "icecc" && setup_icecc_environment
308    
309  # setup ccache  # setup ccache
310  mqueryfeature "ccache" && setup_ccache_environment  mqueryfeature "ccache" && setup_ccache_environment
311    
# Line 400  else Line 394  else
394   export SAVED_BINDIR="${BINDIR}"   export SAVED_BINDIR="${BINDIR}"
395   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
396   do   do
397   if typeset -f src_install_${subpackage} > /dev/null   split_info_${subpackage}
398     if [[ ${PKGTYPE} = virtual ]]
399   then   then
  # export subpackage bindir  
  export BINDIR="${SAVED_BINDIR}_${subpackage}"  
  # export PNAME, several internal function and include  
  # rely on this variable  
  export PNAME="${subpackage}"  
   
400   echo   echo
401   echo -en "${COLBLUE}*** ${COLDEFAULT}"   echo -en "${COLBLUE}*** ${COLDEFAULT}"
402   echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"   echo -en "Virtual package detected"
403   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
404   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
405    
406   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}   echo "virtual package detected; nothing will be build ..."
407   die_pipestatus 0 "src_install_${subpackage} failed"   # automatically set !pkgbuild here too
408   resume_stamp src_install_${subpackage}   msetfeature "!pkgbuild"
409   step_by_step src_install_${subpackage}   else
410     if typeset -f src_install_${subpackage} > /dev/null
411     then
412     # export subpackage bindir
413     export BINDIR="${SAVED_BINDIR}_${subpackage}"
414     # export PNAME, several internal function and include
415     # rely on this variable
416     export PNAME="${subpackage}"
417    
418     echo
419     echo -en "${COLBLUE}*** ${COLDEFAULT}"
420     echo -en "Running ${COLGREEN}split src_install()${COLDEFAULT}"
421     echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
422     echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
423    
424     ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}
425     die_pipestatus 0 "src_install_${subpackage} failed"
426     resume_stamp src_install_${subpackage}
427     step_by_step src_install_${subpackage}
428     fi
429   fi   fi
430     # restore smage environment
431     split_restore_variables
432   done   done
  # restore bindir & pname  
  split_restore_variables  
433   # unset all saved smage variables   # unset all saved smage variables
434   split_unset_variables   split_unset_variables
435   else   else
# Line 445  else Line 453  else
453   # compressing doc, info & man files   # compressing doc, info & man files
454   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
455   then   then
456     # save smage environment
457     split_save_variables
458   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
459   do   do
460   run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}   # honor split_info
461   resume_stamp post-mcompressdoc_${subpackage}   split_info_${subpackage}
462     if [[ ${PKGTYPE} = virtual ]]
463     then
464     # automatically set !pkgbuild here too
465     msetfeature "!pkgbuild"
466     fi
467    
468     if mqueryfeature "!compressdoc"
469     then
470     echo -e "!compressdoc detected; documentation of '${subpackage}' will not be compressed ..."
471     elif mqueryfeature "!pkgbuild"
472     then
473     echo "!pkgbuild detected; skipping documentation compression for '${subpackage}' ..."
474     else
475     run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
476     resume_stamp post-mcompressdoc_${subpackage}
477     fi
478     # restore smage environment
479     split_restore_variables
480   done   done
481     # unset saved variables
482     split_unset_variables
483   else   else
484   run_resume post-mcompressdoc || mcompressdocs ${BINDIR}   run_resume post-mcompressdoc || mcompressdocs ${BINDIR}
485   resume_stamp post-mcompressdoc   resume_stamp post-mcompressdoc
# Line 464  then Line 494  then
494   else   else
495   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
496   then   then
497     # save smage environment
498     split_save_variables
499   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
500   do   do
501   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"   # honor split_info
502   run_resume post-mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}   split_info_${subpackage}
503   resume_stamp post-mstriplibtoolarchive_${subpackage}   if [[ ${PKGTYPE} = virtual ]]
504     then
505     # automatically set !pkgbuild here too
506     msetfeature "!pkgbuild"
507     fi
508    
509     if mqueryfeature "!libtool"
510     then
511     if mqueryfeature "!pkgbuild"
512     then
513     echo "!pkgbuild detected; skipping libtool archive stripping for '${subpackage}'..."
514     else
515     echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"
516     run_resume post-mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}
517     resume_stamp post-mstriplibtoolarchive_${subpackage}
518     fi
519     fi
520    
521     # restore smage environment
522     split_restore_variables
523   done   done
524     # unset saved variables
525     split_unset_variables
526   else   else
527   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
528   run_resume post-mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}   run_resume post-mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}
# Line 482  if mqueryfeature "purge" Line 535  if mqueryfeature "purge"
535  then  then
536   if mqueryfeature "!pkgbuild"   if mqueryfeature "!pkgbuild"
537   then   then
538   echo "!pkgbuild detected; skipping file purgation..."   echo "!pkgbuild detected; skipping file purgation ..."
539   else   else
540   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
541   then   then
542     # save smage environment
543     split_save_variables
544   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
545   do   do
546   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"   # honor split_info
547   run_resume post-mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}   split_info_${subpackage}
548   resume_stamp post-mpurgetargets_${subpackage}   if [[ ${PKGTYPE} = virtual ]]
549     then
550     # automatically set !pkgbuild here too
551     msetfeature "!pkgbuild"
552     fi
553    
554     if mqueryfeature "purge"
555     then
556     if mqueryfeature "!pkgbuild"
557     then
558     echo "!pkgbuild detected; skipping file purgation for '${subpackage}' ..."
559     else
560     echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"
561     run_resume post-mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}
562     resume_stamp post-mpurgetargets_${subpackage}
563     fi
564     fi
565    
566     # restore smage environment
567     split_restore_variables
568   done   done
569     # unset saved variables
570     split_unset_variables
571   else   else
572   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
573   run_resume post-mpurgetargets || mpurgetargets ${BINDIR}   run_resume post-mpurgetargets || mpurgetargets ${BINDIR}
# Line 503  fi Line 579  fi
579  # stripping all bins and libs  # stripping all bins and libs
580  if mqueryfeature "!strip"  if mqueryfeature "!strip"
581  then  then
582   echo -e "!strip detected; Package will not be stripped ..."   echo -e "!strip detected; package will not be stripped ..."
583  elif mqueryfeature "!pkgbuild"  elif mqueryfeature "!pkgbuild"
584  then  then
585   echo "!pkgbuild detected; skipping stripping of the package ..."   echo "!pkgbuild detected; skipping stripping of the package ..."
586  else  else
587   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
588   then   then
589     # save smage environment
590     split_save_variables
591   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
592   do   do
593   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   # honor split_info
594   run_resume post-mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}   split_info_${subpackage}
595   resume_stamp post-mstripbins_${subpackage}   if [[ ${PKGTYPE} = virtual ]]
596   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   then
597   run_resume post-mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}   # automatically set !pkgbuild here too
598   resume_stamp post-mstriplibs_${subpackage}   msetfeature "!pkgbuild"
599   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   fi
600   run_resume post-mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}  
601   resume_stamp post-mstripstatic_${subpackage}   if mqueryfeature "!strip"
602     then
603     echo -e "!strip detected; package '${subpackage}' will not be stripped ..."
604     elif mqueryfeature "!pkgbuild"
605     then
606     echo "!pkgbuild detected; skipping stripping of the package '${subpackage}' ..."
607     else
608     echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
609     run_resume post-mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}
610     resume_stamp post-mstripbins_${subpackage}
611     echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
612     run_resume post-mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}
613     resume_stamp post-mstriplibs_${subpackage}
614     echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
615     run_resume post-mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}
616     resume_stamp post-mstripstatic_${subpackage}
617     fi
618    
619     # restore smage environment
620     split_restore_variables
621   done   done
622     # unset saved variables
623     split_unset_variables
624   else   else
625   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
626   run_resume post-mstripbins || mstripbins ${BINDIR}   run_resume post-mstripbins || mstripbins ${BINDIR}
# Line 535  else Line 634  else
634   fi   fi
635  fi  fi
636    
637  if mqueryfeature "!pkgbuild"  if mqueryfeature "qalint"
638  then  then
639   echo -e "!pkgbuild detected; Package will not be build ..."   if mqueryfeature "!pkgbuild"
640  else   then
641   # build several targets   echo "!pkgbuild detected; skipping QA lint checks ..."
642   if [[ -n ${MAGE_TARGETS} ]]   else
643     if [[ -n ${SPLIT_PACKAGES} ]]
644   then   then
645   for target in ${MAGE_TARGETS}   # save smage environment
646     split_save_variables
647     for subpackage in ${SPLIT_PACKAGES}
648   do   do
649   # check if a special target_pkgbuild exists   # honor split_info
650   if typeset -f ${target}_pkgbuild > /dev/null   split_info_${subpackage}
651     if [[ ${PKGTYPE} = virtual ]]
652   then   then
653   # run it   # automatically set !pkgbuild here too
654   run_resume post-${target}_pkgbuild || ${target}_pkgbuild   msetfeature "!pkgbuild"
  resume_stamp post-${target}_pkgbuild  
655   fi   fi
  # now create the target package  
  run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \  
  "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \  
  ${BINDIR} || die "target: ${target} package-build failed"  
  resume_stamp post-pkg_builddir_${target}  
656    
657   # build pkg-md5-sum if requested   if mqueryfeature "qalint"
658   run_resume post-md5sum_${target} || generate_package_md5sum \   then
659   --pcat "${PCATEGORIE}" \   if mqueryfeature "!pkgbuild"
660   --pname "${PNAME}" \   then
661   --pver "${PVER}" \   echo "!pkgbuild detected; skipping QA lint checks for '${subpackage}' ..."
662   --pbuild "${PBUILD}" \   else
663   --parch "${ARCH}" \   echo -e "${COLBLUE}===${COLGREEN} running QA lint checks for '${subpackage}' ...${COLDEFAULT}"
664   --target "${target}"   mqalint ${BINDIR}_${subpackage}
665   resume_stamp post-md5sum_${target}   fi
666     fi
667    
668   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   # restore smage environment
669     split_restore_variables
670   done   done
671     # unset saved variables
672     split_unset_variables
673     else
674     echo -e "${COLBLUE}===${COLGREEN} running QA lint checks ...${COLDEFAULT}"
675     mqalint ${BINDIR}
676     fi
677     fi
678    fi
679    
680    if mqueryfeature "!pkgbuild"
681    then
682     echo -e "!pkgbuild detected; Package will not be build ..."
683    else
684   # build several subpackages   # build several subpackages
685   elif [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
686   then   then
687   split_save_variables   split_save_variables
688   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
# Line 579  else Line 690  else
690   # get the right variables for the split   # get the right variables for the split
691   export PNAME="${subpackage}"   export PNAME="${subpackage}"
692   split_info_${PNAME}   split_info_${PNAME}
693     # fix PCATEGORIE -> PCAT
694     if [[ ! -z ${PCATEGORIE} ]]
695     then
696     PCAT="${PCATEGORIE}"
697     unset PCATEGORIE
698     fi
699     if [[ ${PKGTYPE} = virtual ]]
700     then
701     # automatically set !pkgbuild here too
702     msetfeature "!pkgbuild"
703     fi
704    
705   # jump to next one if !pkgbuild is set in split_info   # jump to next one if !pkgbuild is set in split_info
706   mqueryfeature "!pkgbuild" && continue   if mqueryfeature "!pkgbuild"
707     then
708     # restore smage environment
709     split_restore_variables
710     continue
711     fi
712    
713   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
714   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
# Line 592  else Line 719  else
719   fi   fi
720   # now create the target package   # now create the target package
721   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
722   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
723   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
724   resume_stamp post-pkg_builddir_${PNAME}   resume_stamp post-pkg_builddir_${PNAME}
725    
726   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
727   run_resume post-md5sum_${PNAME} || generate_package_md5sum \   run_resume post-md5sum_${PNAME} || generate_package_md5sum \
728   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
729   --pname "${PNAME}" \   --pname "${PNAME}" \
730   --pver "${PVER}" \   --pver "${PVER}" \
731   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
732   --parch "${ARCH}"   --parch "${ARCH}"
733   resume_stamp post-md5sum_${PNAME}   resume_stamp post-md5sum_${PNAME}
734    
735   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD} successfully builded.\n${COLDEFAULT}"
736    
737   # restore smage environment   # restore smage environment
738   split_restore_variables   split_restore_variables
# Line 619  else Line 746  else
746    
747   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
748   run_resume post-md5sum || generate_package_md5sum \   run_resume post-md5sum || generate_package_md5sum \
749   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
750   --pname "${PNAME}" \   --pname "${PNAME}" \
751   --pver "${PVER}" \   --pver "${PVER}" \
752   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
# Line 637  else Line 764  else
764   fi   fi
765  fi  fi
766    
767    # auto regen mage tree if requested
768    regen_mage_tree
769    
770  if mqueryfeature "buildlog"  if mqueryfeature "buildlog"
771  then  then
772   bzip2 -9f /var/log/smage/${PKGNAME}.log   bzip2 -9f /var/log/smage/${PKGNAME}.log

Legend:
Removed from v.1640  
changed lines
  Added in v.2614