[84060] contrib/mpab

[jmr at macports.org]

Revision: 84060
          http://trac.macports.org/changeset/84060
Author:   jmr at macports.org
Date:     2011-09-15 19:39:34 -0700 (Thu, 15 Sep 2011)
Log Message:
-----------
mpab: move running of portindex back to mpsync.sh so it's done before creating the portlist file

Modified Paths:
--------------
    contrib/mpab/mpab-functions
    contrib/mpab/mpsync.sh

Modified: contrib/mpab/mpab-functions
===================================================================
--- contrib/mpab/mpab-functions	2011-09-16 01:52:34 UTC (rev 84059)
+++ contrib/mpab/mpab-functions	2011-09-16 02:39:34 UTC (rev 84060)
@@ -215,6 +215,8 @@
    local chrootPath=$3
    local mpExport=$4
 
+   needIndex=""
+
    if [[ ! -d ${chrootPath}${SRC_PREFIX} ]]; then
       if [[ -f ${dataDir}/${mpExport} ]]; then
 	 mkdir -p ${chrootPath}${SRC_PREFIX}
@@ -240,13 +242,17 @@
          return 1
       fi
       chmod -R a+rX ${chrootPath}${SRC_PREFIX}
+      needIndex=1
    fi
 
    if [[ ! -f ${chrootPath}${PREFIX}/bin/port ]]; then
       chrootExec installmacports
+      needIndex=1
    fi
 
-   chrootExec recreateportindex
+   if [[ -n "$needIndex" ]]; then
+      chrootExec recreateportindex
+   fi
 
    return 0
 }

Modified: contrib/mpab/mpsync.sh
===================================================================
--- contrib/mpab/mpsync.sh	2011-09-16 01:52:34 UTC (rev 84059)
+++ contrib/mpab/mpsync.sh	2011-09-16 02:39:34 UTC (rev 84060)
@@ -68,6 +68,8 @@
     ${dataDir}/${exportDir}/ \
     ${chrootPath}${SRC_PREFIX} || exit 1
 
+chroot_exec recreateportindex
+
 if [[ "$BASE_UPDATE" == "selfupdate" ]]; then
     chroot_exec selfupdate
 elif [[ "$BASE_UPDATE" == "svn" ]]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110915/5951cf6c/attachment.html>