[50613] branches/images-and-archives/base/src

[blb at macports.org]

Revision: 50613
          http://trac.macports.org/changeset/50613
Author:   blb at macports.org
Date:     2009-05-04 19:38:26 -0700 (Mon, 04 May 2009)
Log Message:
-----------
Remove compact/uncompact which were never implemented and won't be needed
in this branch's design

Modified Paths:
--------------
    branches/images-and-archives/base/src/macports1.0/macports.tcl
    branches/images-and-archives/base/src/port/port-help.tcl
    branches/images-and-archives/base/src/port/port.tcl
    branches/images-and-archives/base/src/registry1.0/portimage.tcl

Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-05-05 02:28:44 UTC (rev 50612)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-05-05 02:38:26 UTC (rev 50613)
@@ -1241,7 +1241,7 @@
     return 0
 }
 
-# Determine if a port is active (only for image mode)
+# Determine if a port is active
 proc _mportactive {mport} {
     set workername [ditem_key $mport workername]
     if {[catch {set reslist [$workername eval registry_active \${portname}]}]} {
@@ -1254,7 +1254,7 @@
 ### _mportispresent is private; may change without notice
 
 # Determine if some depspec is satisfied or if the given port is installed
-# (and active, if we're in image mode).
+# and active
 # We actually start with the registry (faster?)
 #
 # mport     the port to test (to figure out if it's present)
@@ -1344,8 +1344,6 @@
         dlist_delete dlist $mport
 
         # install them
-        # xxx: as with below, this is ugly.  and deps need to be fixed to
-        # understand Port Images before this can get prettier
         set result [dlist_eval $dlist _mportactive [list _mportexec "activate"]]
 
         if {$result != {}} {

Modified: branches/images-and-archives/base/src/port/port-help.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port-help.tcl	2009-05-05 02:28:44 UTC (rev 50612)
+++ branches/images-and-archives/base/src/port/port-help.tcl	2009-05-05 02:38:26 UTC (rev 50613)
@@ -42,10 +42,6 @@
 --all         Removes everything from above
 }
 
-set porthelp(compact) {
-Compact the given ports (unimplemented)
-}
-
 set porthelp(configure) {
 Configure the given ports
 }
@@ -273,10 +269,6 @@
 Unarchive the given ports
 }
 
-set porthelp(uncompact) {
-Uncompact a port (unimplemented)
-}
-
 set porthelp(uninstall) {
 Uninstall the given ports
 }

Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl	2009-05-05 02:28:44 UTC (rev 50612)
+++ branches/images-and-archives/base/src/port/port.tcl	2009-05-05 02:38:26 UTC (rev 50613)
@@ -1985,40 +1985,6 @@
 }
 
 
-proc action_compact { action portlist opts } {
-    set status 0
-    if {[require_portlist portlist]} {
-        return 1
-    }
-    foreachport $portlist {
-        if { [catch {portimage::compact $portname [composite_version $portversion [array get variations]]} result] } {
-            global errorInfo
-            ui_debug "$errorInfo"
-            break_softcontinue "port compact failed: $result" 1 status
-        }
-    }
-
-    return $status
-}
-
-
-proc action_uncompact { action portlist opts } {
-    set status 0
-    if {[require_portlist portlist]} {
-        return 1
-    }
-    foreachport $portlist {
-        if { [catch {portimage::uncompact $portname [composite_version $portversion [array get variations]]} result] } {
-            global errorInfo
-            ui_debug "$errorInfo"
-            break_softcontinue "port uncompact failed: $result" 1 status
-        }
-    }
-    
-    return $status
-}
-
-
 proc action_dependents { action portlist opts } {
     if {[require_portlist portlist]} {
         return 1

Modified: branches/images-and-archives/base/src/registry1.0/portimage.tcl
===================================================================
--- branches/images-and-archives/base/src/registry1.0/portimage.tcl	2009-05-05 02:28:44 UTC (rev 50612)
+++ branches/images-and-archives/base/src/registry1.0/portimage.tcl	2009-05-05 02:38:26 UTC (rev 50613)
@@ -55,9 +55,6 @@
 # will also remove all of the references of the files from the registry's 
 # file_map
 #
-# Compacting and Uncompacting of port images to save space will be implemented
-# at some point.
-#
 # For the creating and removing of links during activation and deactivation,
 # code very similar to what is used in portinstall is used.
 #
@@ -111,9 +108,6 @@
 	if { [registry::property_retrieve $ref active] != 0 } {
 		return -code error "Image error: ${name} @${version}_${revision}${variants} is already active."
 	} 
-	if { [registry::property_retrieve $ref compact] != 0 } {
-		return -code error "Image error: ${name} @${version}_${revision}${variants} is compactd."
-	} 
 
 	set imagedir [registry::property_retrieve $ref imagedir]
 
@@ -173,9 +167,6 @@
 	if { [registry::property_retrieve $ref active] != 1 } {
 		return -code error "Image error: ${name} @${fqversion} is not active."
 	} 
-	if { [registry::property_retrieve $ref compact] != 0 } {
-		return -code error "Image error: ${name} @${fqversion} is compactd."
-	} 
 
 	set imagedir [registry::property_retrieve $ref imagedir]
 
@@ -195,20 +186,6 @@
 
 }
 
-proc compact {name v} {
-	global UI_PREFIX
-
-	return -code error "Image error: compact/uncompact not yet implemented."
-
-}
-
-proc uncompact {name v} {
-	global UI_PREFIX
-
-	return -code error "Image error: compact/uncompact not yet implemented."
-
-}
-
 proc _check_registry {name v} {
 	global UI_PREFIX
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090504/88000dac/attachment.html>