[101360] branches/release_2_1

[jmr at macports.org]

Revision: 101360
          https://trac.macports.org/changeset/101360
Author:   jmr at macports.org
Date:     2013-01-09 06:31:38 -0800 (Wed, 09 Jan 2013)
Log Message:
-----------
merge r101359 from trunk:
 update ChangeLog

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

Modified Paths:
--------------
    branches/release_2_1/base/ChangeLog

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/
    branches/release_2_1/base/ChangeLog


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828,101163,101166,101270,101274,101311,101313,101357
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828,101163,101166,101270,101274,101311,101313,101357,101359


Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828,101163,101166,101270,101274,101311,101313,101357
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828,101163,101166,101270,101274,101311,101313,101357,101359
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_1/base/ChangeLog
===================================================================
--- branches/release_2_1/base/ChangeLog	2013-01-09 14:29:56 UTC (rev 101359)
+++ branches/release_2_1/base/ChangeLog	2013-01-09 14:31:38 UTC (rev 101360)
@@ -13,9 +13,10 @@
       ccache >= 3.1.7 by running the initialization step as the macportsuser.
       (raimue in r97868)
 
-    - Fix an endless loop that could be triggered in rev-upgrade when a user
-      hasn't run selfupdate in more than a year or the portindex is corrupt.
-      (cal in r100129)
+    - Fix an endless loop that could be triggered in rev-upgrade when a broken
+      port is not in the index, e.g. when it has been deleted from the tree,
+      or it was installed directly from a Portfile not in the tree.
+      (cal in r100129, jmr in r101313)
 
     - Set a busy timeout on SQLite connections to prevent MacPorts from
       uselessly burning CPU cycles when waiting for a database lock.


Property changes on: branches/release_2_1/base/ChangeLog
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/ChangeLog:37343-46937
/branches/gsoc09-logging/base/ChangeLog:51231-60371
/branches/gsoc11-rev-upgrade/base/ChangeLog:78828-88375
/branches/universal-sanity/base/ChangeLog:51872-52323
/branches/variant-descs-14482/base/ChangeLog:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/ChangeLog:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129,93153,93197,93225,93250,93256,93268,93274,95439,95620,95873,96137,96399-96401,96539,97869,100129,100217-100220,101274
/users/perry/base-bugs_and_notes/ChangeLog:45682-46060
/users/perry/base-select/ChangeLog:44044-44692
   + /branches/gsoc08-privileges/base/ChangeLog:37343-46937
/branches/gsoc09-logging/base/ChangeLog:51231-60371
/branches/gsoc11-rev-upgrade/base/ChangeLog:78828-88375
/branches/universal-sanity/base/ChangeLog:51872-52323
/branches/variant-descs-14482/base/ChangeLog:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/ChangeLog:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129,93153,93197,93225,93250,93256,93268,93274,95439,95620,95873,96137,96399-96401,96539,97869,100129,100217-100220,101274,101359
/users/perry/base-bugs_and_notes/ChangeLog:45682-46060
/users/perry/base-select/ChangeLog:44044-44692
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130109/a767f607/attachment.html>