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

source_changes at macosforge.org source_changes at macosforge.org
Sun May 20 13:01:00 PDT 2007


Revision: 25386
          http://trac.macosforge.org/projects/macports/changeset/25386
Author:   jmpp at macports.org
Date:     2007-05-20 13:01:00 -0700 (Sun, 20 May 2007)

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

Add reinplace to remove legacy quotes from the rsync_options key in old config files, while preserving the supplied flags intact.
Thanks to N_Ox and sfiera in #MacPorts @ freenode for the valuable help in putting the regex together!

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

Modified: branches/dp2mp-move/base/Makefile.in
===================================================================
--- branches/dp2mp-move/base/Makefile.in	2007-05-20 19:59:10 UTC (rev 25385)
+++ branches/dp2mp-move/base/Makefile.in	2007-05-20 20:01:00 UTC (rev 25386)
@@ -75,14 +75,17 @@
 	sed 's/dpupdate\/dports/release\/ports\//g' ${sysconfdir}/macports/sources.conf > ${sysconfdir}/macports/sources.conf.tmp && \
 	mv -v ${sysconfdir}/macports/sources.conf.tmp ${sysconfdir}/macports/sources.conf
 
+# Stray quotes are removed from the rsync_options in old conf files
+	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
 
+
 #something more?
 
 ####
 # NOTES:
 #    -) should we use the ${DESTDIR} sandbox?
 #    -) should we force moves?
-#    -) rsync flags in main conf file still need an upgrading rule to remove legacy quotes (but nothing more!);
 #    -) receipts still need an updating rule!
 #    -) not sure if its safe moving the software and packages dirs...
 #    -) maybe I can regroup at least some of the sed calls?

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


More information about the macports-changes mailing list