[25940] branches/dp2mp-move/base/Makefile.in

[source_changes at macosforge.org]

Revision: 25940
          http://trac.macosforge.org/projects/macports/changeset/25940
Author:   jmpp at macports.org
Date:     2007-06-06 20:05:28 -0700 (Wed, 06 Jun 2007)

Log Message:
-----------

Only attempt to create the ${localstatedir}/macports directory if it doesn't already exist.

Modified Paths:
--------------
    branches/dp2mp-move/base/Makefile.in

Modified: branches/dp2mp-move/base/Makefile.in
===================================================================
--- branches/dp2mp-move/base/Makefile.in	2007-06-07 02:51:48 UTC (rev 25939)
+++ branches/dp2mp-move/base/Makefile.in	2007-06-07 03:05:28 UTC (rev 25940)
@@ -27,7 +27,7 @@
 	fi
 
 upgrade:
-	@echo -e "\nUpgrading your existing MacPorts installation to the new layout.\n"
+	@echo -e "\nUpgrading your existing MacPorts installation to the new layout:\n"
 
 # We can safely delete the ${TCL_PACKAGE_DIR}/darwinports1.0 dir as files in it are always overwritten and will now be installed onto
 # ${TCL_PACKAGE_DIR}/macports1.0 with new names:
@@ -46,13 +46,13 @@
 	[ ! -d ${sysconfdir}/ports ] || mv -v ${sysconfdir}/ports ${sysconfdir}/macports
 
 # Important directories inside ${localstatedir}/db/dports are moved to their new location, creating it first:
-	mkdir -p ${localstatedir}/macports
+	[ -d ${localstatedir}/macports ] || mkdir -vp ${localstatedir}/macports
 	for dir in distfiles packages receipts software; do \
 		[ ! -d ${localstatedir}/db/dports/$${dir} ] || mv -v ${localstatedir}/db/dports/$${dir} ${localstatedir}/macports ; \
 	done
 
 # Move the default ports tree to the new layout:
-	[ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || { mkdir -pv \
+	[ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || { mkdir -vp \
 	${localstatedir}/macports/sources/rsync.macports.org/release && mv -v \
 	${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ${localstatedir}/macports/sources/rsync.macports.org/release/ports ; }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070606/fa51d3fd/attachment.html