[21110] trunk

[source_changes at macosforge.org]

Revision: 21110
          http://trac.macosforge.org/projects/macports/changeset/21110
Author:   dluke at macports.org
Date:     2007-01-02 14:32:21 -0800 (Tue, 02 Jan 2007)

Log Message:
-----------
Set upgrade.target back to archive (from unarchive)

When upgrade_action is set to 'archive' we get this sequence of events:

fetch/configure/build/destroot/archive new version
uninstall old version
install new version

With upgrade action set to 'unarchive' (as it is currently) we get this sequence:

uninstall old versino
fetch/configure/build/destroot/archive/install new version

Changing it to 'unarchive' allows one to copy archives over and have upgrade 'just work', so changing it back will also lead to some undesired behavior (but less undesired I think, and probably easier to fix the archive target to check for an existing archive and not re-create it without force than to modify the sequence of events for the unarchive target).

Modified Paths:
--------------
    trunk/base/src/darwinports1.0/darwinports.tcl

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21119
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
f2dd1c64-7982-4318-98ce-263798263e0a:/local:21201
   + 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21119
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
f2dd1c64-7982-4318-98ce-263798263e0a:/local:21203

Modified: trunk/base/src/darwinports1.0/darwinports.tcl
===================================================================
--- trunk/base/src/darwinports1.0/darwinports.tcl	2007-01-02 22:28:57 UTC (rev 21109)
+++ trunk/base/src/darwinports1.0/darwinports.tcl	2007-01-02 22:32:21 UTC (rev 21110)
@@ -1671,7 +1671,7 @@
 
 	# install version_in_tree
 	if {0 == [string compare "yes" ${darwinports::portarchivemode}]} {
-		set upgrade_action "unarchive"
+		set upgrade_action "archive"
 	} else {
 		set upgrade_action "destroot"
 	}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070102/7bf60440/attachment.html