[42761] branches/release_1_7

[jmr at macports.org]

Revision: 42761
          http://trac.macports.org/changeset/42761
Author:   jmr at macports.org
Date:     2008-11-30 08:57:19 -0800 (Sun, 30 Nov 2008)
Log Message:
-----------
Merge r42760 from trunk:
    Upgrade sources.conf before cleaning the dep_map, since the latter can fail otherwise.

Modified Paths:
--------------
    branches/release_1_7/base/Makefile.in

Property Changed:
----------------
    branches/release_1_7/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747
   + /trunk:42683,42697,42734,42747,42760

Modified: branches/release_1_7/base/Makefile.in
===================================================================
--- branches/release_1_7/base/Makefile.in	2008-11-30 16:52:48 UTC (rev 42760)
+++ branches/release_1_7/base/Makefile.in	2008-11-30 16:57:19 UTC (rev 42761)
@@ -38,10 +38,10 @@
 
 install::
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash  ${datadir}/macports/
+# Add [default] tag to the central MacPorts repository, if it isn't already
+	$(TCLSH) src/upgrade_sources_conf_default.tcl ${prefix}
 # Remove duplicate entries from the dependency map (could occur with 1.6 and earlier):
 	$(TCLSH) src/dep_map_clean.tcl ${TCL_PACKAGE_DIR}
-# Add [default] tag to the central MacPorts repository, if it isn't already
-	$(TCLSH) src/upgrade_sources_conf_default.tcl ${prefix}
 	@echo ""; echo "Congratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, run:"; echo ""
 	@echo "sudo port -v selfupdate"; echo ""
 	@echo "Please read \"man port\", the MacPorts guide at http://guide.macports.org/ and Wiki at http://trac.macports.org/ for full documentation."; echo ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081130/eaac3c99/attachment.html>