[154183]

[raimue at macports.org]

Revision: 154183
          https://trac.macports.org/changeset/154183
Author:   raimue at macports.org
Date:     2016-10-23 18:34:19 +0200 (Sun, 23 Oct 2016)
Log Message:
-----------
merge r154110 from trunk:
 Installer postflight: Fix useless test
 
 $OUR_STRING used to contain a timestamp down to second precision, which makes
 it very unlikely to hit a match. grep for something more likely to match
 instead.

Revision Links:
--------------
    https://trac.macports.org/changeset/154110

Modified Paths:
--------------
    branches/release_2_3/base/portmgr/dmg/postflight.in

Property Changed:
----------------
    branches/release_2_3/base/

Index: branches/release_2_3/base
===================================================================
--- branches/release_2_3/base	2016-10-23 16:33:17 UTC (rev 154182)
+++ branches/release_2_3/base	2016-10-23 16:34:19 UTC (rev 154183)

Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,6 ##
 /branches/gsoc13-tests:106692-111324
 /branches/universal-sanity/base:51872-52323
 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
-/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073
+/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073,154110
 /users/perry/base-bugs_and_notes:45682-46060
 /users/perry/base-select:44044-44692
\ No newline at end of property
Modified: branches/release_2_3/base/portmgr/dmg/postflight.in
===================================================================
--- branches/release_2_3/base/portmgr/dmg/postflight.in	2016-10-23 16:33:17 UTC (rev 154182)
+++ branches/release_2_3/base/portmgr/dmg/postflight.in	2016-10-23 16:34:19 UTC (rev 154183)
@@ -50,7 +50,8 @@
 TCL_PACKAGE_PATH="@TCL_PACKAGE_PATH@"
 TIMESTAMP=$(date +"%Y-%m-%d_at_%H:%M:%S")
 BACKUP_SUFFIX=macports-saved_${TIMESTAMP}
-OUR_STRING="MacPorts Installer addition on ${TIMESTAMP}"
+OUR_BASESTRING="MacPorts Installer addition"
+OUR_STRING="${OUR_BASESTRING} on ${TIMESTAMP}"
 
 OLD_MACPORTS_TCL_DIR=${PREFIX}/share/macports/Tcl
 OLD_TCL_PACKAGE_DIR=/Library/Tcl
@@ -90,7 +91,7 @@
 # backing up the original only if it exists and if it doesn't contain the ${OUR_STRING} identification string,
 # which hints that we've already tweaked it and therefore already backed it up.
 function write_setting () {
-    if [[ -f "${HOME}/.${CONF_FILE}" ]] && ! grep "${OUR_STRING}" "${HOME}/.${CONF_FILE}" > /dev/null; then
+    if [[ -f "${HOME}/.${CONF_FILE}" ]] && ! grep "${OUR_BASESTRING}" "${HOME}/.${CONF_FILE}" > /dev/null; then
         echo "Backing up your ${HOME}/.${CONF_FILE} shell confguration file as ${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX} before adapting it for MacPorts."
         /bin/cp -fp "${HOME}/.${CONF_FILE}" "${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX}" || {
             echo "An attempt to backup your original configuration file failed! Please set your MacPorts compatible environment manually."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161023/4650f409/attachment-0002.html>