[26533] trunk/base

[source_changes at macosforge.org]

Revision: 26533
          http://trac.macosforge.org/projects/macports/changeset/26533
Author:   jmpp at macports.org
Date:     2007-06-27 15:39:54 -0700 (Wed, 27 Jun 2007)

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

Fix sed rule deleting unnecessary --delete flag: don't replace with no space, as that'll produde -rztv--delete

Modified Paths:
--------------
    trunk/base/Makefile.in
    trunk/base/portmgr/dmg/preflight

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2007-06-27 22:33:16 UTC (rev 26532)
+++ trunk/base/Makefile.in	2007-06-27 22:39:54 UTC (rev 26533)
@@ -88,7 +88,7 @@
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
 		sed '/^rsync_options/s/"\(.*\)"/\1/' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
-		sed 's/ --delete //' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+		sed 's/ --delete / /' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
 		sed 's/ ports.conf(5)/ macports.conf(5)/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
@@ -131,7 +131,7 @@
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
 		sed '/^rsync_options/s/"\(.*\)"/\1/' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
-		sed 's/ --delete //' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
+		sed 's/ --delete / /' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
 		sed 's/ ports.conf(5)/ macports.conf(5)/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \

Modified: trunk/base/portmgr/dmg/preflight
===================================================================
--- trunk/base/portmgr/dmg/preflight	2007-06-27 22:33:16 UTC (rev 26532)
+++ trunk/base/portmgr/dmg/preflight	2007-06-27 22:39:54 UTC (rev 26533)
@@ -82,7 +82,7 @@
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
   sed '/^rsync_options/s/"\(.*\)"/\1/' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
-  sed 's/ --delete //' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+  sed 's/ --delete / /' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
   sed 's/ ports.conf(5)/ macports.conf(5)/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
@@ -112,7 +112,7 @@
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
   sed '/^rsync_options/s/"\(.*\)"/\1/' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-  sed 's/ --delete //' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+  sed 's/ --delete / /' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
   sed 's/ ports.conf(5)/ macports.conf(5)/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf

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