Changeset 25782

Timestamp:

06/01/07 11:02:49 (18 months ago)

Author:

jmpp@…

Message:

Add sed rule to update dpupdate/base/ sources to the new trunk/base/ rsync module, taking into consideration that some
users might have written dpupdate/base without the trailing slash. Thanks to sfiera for both providing feedback on this
omission of mine and for helping me put the regex together to match trailing slash or not and replace both cases with
trunk/base/.

Tested upgrading a trunk based MP installation.

Files:

• branches/dp2mp-move/base/Makefile.in (modified) (2 diffs)

branches/dp2mp-move/base/Makefile.in

@@ -72 +72 @@
 ## 3) new MacPorts rsync server;
 ## 4) new default value for the base tree;
-## 5) stray quotes are removed from the value of the rsync_options key in old conf files;
-## 6) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 7) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
+## 5) new default value for trunk's base sources for users who have it (some do);
+## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
+## 7) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
+## 8) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
         [ ! -f ${sysconfdir}/macports/macports.conf ] || { \
                 [ -f ${sysconfdir}/macports/macports.conf.mpsaved ] || cp -v ${sysconfdir}/macports/macports.conf ${sysconfdir}/macports/macports.conf.mpsaved; \
@@ -84 +85 @@
                         mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
                 sed 's/dpupdate1\/base/release\/base/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+                        mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
+                sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
                         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 && \