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

[blb at macports.org]

Revision: 51274
          http://trac.macports.org/changeset/51274
Author:   blb at macports.org
Date:     2009-05-21 21:12:35 -0700 (Thu, 21 May 2009)
Log Message:
-----------
Move path to image files to macports.tcl since it's needed outside port1.0

Modified Paths:
--------------
    branches/images-and-archives/base/src/macports1.0/macports.tcl
    branches/images-and-archives/base/src/port1.0/portimagefile.tcl

Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-05-22 03:50:32 UTC (rev 51273)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-05-22 04:12:35 UTC (rev 51274)
@@ -50,7 +50,7 @@
     variable user_options "submitter_name submitter_email submitter_key"
     variable portinterp_options "\
         portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
-        registry.path registry.format portarchivepath \
+        registry.path registry.format portimagefilepath portarchivepath \
         portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \
         rsync_options rsync_dir startupitem_type place_worksymlink \
         mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
@@ -330,6 +330,7 @@
     global macports::portsharepath
     global macports::registry.format
     global macports::registry.path
+    global macports::portimagefilepath
     global macports::sources
     global macports::sources_default
     global macports::sources_conf
@@ -487,6 +488,7 @@
     }
 
     set registry.path $portdbpath
+    set portimagefilepath [file join $portdbpath images]
 
     # Format for receipts, can currently be either "flat" or "sqlite"
     if {[info exists portdbformat]} {

Modified: branches/images-and-archives/base/src/port1.0/portimagefile.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portimagefile.tcl	2009-05-22 03:50:32 UTC (rev 51273)
+++ branches/images-and-archives/base/src/port1.0/portimagefile.tcl	2009-05-22 04:12:35 UTC (rev 51274)
@@ -40,12 +40,6 @@
 namespace eval portimagefile {
 }
 
-# define options
-options imagefile.imagespath
-
-# set defaults
-default imagefile.imagespath {[file join $portdbpath images]}
-
 set_ui_prefix
 
 proc portimagefile::imagefile_start {args} {
@@ -140,11 +134,11 @@
 }
 
 
-# Install (copy to imagefile.imagespath) an imagefile and register
+# Install (copy to portimagefilepath) an imagefile and register
 # it as installed in the MacPorts registry.  This makes no assumptions
 # about how the imagefile was created/acquired
 proc portimagefile::install_register_imagefile {imagefile} {
-    global imagefile.imagespath prefix
+    global portimagefilepath prefix
     set mytempdir [mkdtemp /tmp/mpimageXXXXXXXX]
     set startpwd [pwd]
     try {
@@ -175,7 +169,7 @@
         if {$imagevars(prefix) != $prefix} {
             throw MACPORTS "Image prefix ($imagevars(prefix)) does not match ours ($prefix)"
         }
-        set portimagepath [file join ${imagefile.imagespath} $imagevars(portname)]
+        set portimagepath [file join ${portimagefilepath} $imagevars(portname)]
         if {![file isdirectory $portimagepath]} {
             file mkdir $portimagepath
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090521/2a87f92a/attachment.html>