[53660] trunk/base/src
jmr at macports.org
jmr at macports.org
Sat Jul 11 03:43:31 PDT 2009
Revision: 53660
http://trac.macports.org/changeset/53660
Author: jmr at macports.org
Date: 2009-07-11 03:43:29 -0700 (Sat, 11 Jul 2009)
Log Message:
-----------
Remove stubs for the port image compaction feature, which is unlikely to ever be implemented.
Modified Paths:
--------------
trunk/base/src/port/port-help.tcl
trunk/base/src/port/port.tcl
trunk/base/src/registry1.0/portimage.tcl
trunk/base/src/registry1.0/registry.tcl
trunk/base/src/registry2.0/portimage.tcl
Modified: trunk/base/src/port/port-help.tcl
===================================================================
--- trunk/base/src/port/port-help.tcl 2009-07-11 10:19:14 UTC (rev 53659)
+++ trunk/base/src/port/port-help.tcl 2009-07-11 10:43:29 UTC (rev 53660)
@@ -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: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl 2009-07-11 10:19:14 UTC (rev 53659)
+++ trunk/base/src/port/port.tcl 2009-07-11 10:43:29 UTC (rev 53660)
@@ -2026,40 +2026,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
@@ -2994,8 +2960,6 @@
\
version [list action_version [action_args_const none]] \
platform [list action_platform [action_args_const none]] \
- compact [list action_compact [action_args_const ports]] \
- uncompact [list action_uncompact [action_args_const ports]] \
\
uninstall [list action_uninstall [action_args_const ports]] \
\
Modified: trunk/base/src/registry1.0/portimage.tcl
===================================================================
--- trunk/base/src/registry1.0/portimage.tcl 2009-07-11 10:19:14 UTC (rev 53659)
+++ trunk/base/src/registry1.0/portimage.tcl 2009-07-11 10:43:29 UTC (rev 53660)
@@ -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.
#
@@ -114,9 +111,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]
@@ -179,10 +173,7 @@
}
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]
@@ -203,20 +194,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
Modified: trunk/base/src/registry1.0/registry.tcl
===================================================================
--- trunk/base/src/registry1.0/registry.tcl 2009-07-11 10:19:14 UTC (rev 53659)
+++ trunk/base/src/registry1.0/registry.tcl 2009-07-11 10:43:29 UTC (rev 53660)
@@ -66,7 +66,6 @@
set imagedir [file join ${macports::registry.path} software ${name} ${version}_${revision}${variants}]
property_store $ref imagedir $imagedir
property_store $ref active 0
- property_store $ref compact 0
}
return $ref
Modified: trunk/base/src/registry2.0/portimage.tcl
===================================================================
--- trunk/base/src/registry2.0/portimage.tcl 2009-07-11 10:19:14 UTC (rev 53659)
+++ trunk/base/src/registry2.0/portimage.tcl 2009-07-11 10:43:29 UTC (rev 53660)
@@ -57,9 +57,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.
#
@@ -114,11 +111,6 @@
if { [string equal [$requested state] "active"] } {
return -code error "Image error: ${name} @${version}_${revision}${variants} is already active."
}
-
- # compaction is not yet supported
- #if { [$requested compact] != 0 } {
- # return -code error "Image error: ${name} @${version}_${revision}${variants} is compacted."
- #}
}
_activate_contents $port $force
@@ -166,11 +158,6 @@
return -code error "Image error: ${name} @${specifier} is not active."
}
- # compaction not yet supported
- #if { [registry::property_retrieve $ref compact] != 0 } {
- # return -code error "Image error: ${name} @${specifier} is compacted."
- #}
-
registry::check_dependents $port $force
set imagedir [$requested imagedir]
@@ -180,18 +167,6 @@
$requested state imaged
}
-proc compact {name v} {
- global UI_PREFIX
-
- throw registry::image-error "Image error: compact/uncompact not yet implemented."
-}
-
-proc uncompact {name v} {
- global UI_PREFIX
-
- throw registry::image-error "Image error: compact/uncompact not yet implemented."
-}
-
proc _check_registry {name specifier} {
global UI_PREFIX
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090711/b5212bad/attachment.html>
More information about the macports-changes
mailing list