Changeset 79587

Timestamp:

06/19/11 05:28:45 (4 years ago)

Author:

jmr@…

Message:

Merge r79586 from trunk:

run upgrade scripts before selfupdating in postflight

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/dmg/postflight (modified) (2 diffs)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/portmgr/dmg/postflight

@@ -67 +67 @@
 # Command to update the MacPorts installation through "selfupdate":
 function update_macports {
+    # Add [default] tag to the central MacPorts repository, if it isn't already
+    echo "Adding [default] tag to sources.conf if needed..."
+    ${TCLSH} ${PACKAGE_PATH}/Contents/Resources/upgrade_sources_conf_default.tcl ${PREFIX}
+    # Convert image directories (and direct mode installs) to image archives
+    echo "Updating port image format..."
+    ${TCLSH} ${PACKAGE_PATH}/Contents/Resources/images_to_archives.tcl ${MACPORTS_TCL_DIR}
+
     echo "Synchronizing the MacPorts installation with the project's rsync server..."
     if ! ${BINPATH}/port -v selfupdate; then 
@@ -74 +81 @@
         echo "Successful!"
     fi
-    
-    # Add [default] tag to the central MacPorts repository, if it isn't already
-    ${TCLSH} ${PACKAGE_PATH}/Contents/Resources/upgrade_sources_conf_default.tcl ${PREFIX}
-    # Convert image directories (and direct mode installs) to image archives
-    ${TCLSH} ${PACKAGE_PATH}/Contents/Resources/images_to_archives.tcl ${MACPORTS_TCL_DIR}
 }