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

[blb at macports.org]

Revision: 50694
          http://trac.macports.org/changeset/50694
Author:   blb at macports.org
Date:     2009-05-06 22:41:19 -0700 (Wed, 06 May 2009)
Log Message:
-----------
Remove source/binary only options

Modified Paths:
--------------
    branches/images-and-archives/base/src/package1.0/portarchive.tcl
    branches/images-and-archives/base/src/package1.0/portunarchive.tcl
    branches/images-and-archives/base/src/port/port.tcl

Modified: branches/images-and-archives/base/src/package1.0/portarchive.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portarchive.tcl	2009-05-07 05:07:30 UTC (rev 50693)
+++ branches/images-and-archives/base/src/package1.0/portarchive.tcl	2009-05-07 05:41:19 UTC (rev 50694)
@@ -66,7 +66,7 @@
 proc portarchive::archive_init {args} {
 	global UI_PREFIX target_state_fd
 	global variations package.destpath workpath
-	global ports_force ports_source_only ports_binary_only
+	global ports_force
 	global portname portversion portrevision portvariants
 	global archive.destpath archive.type archive.meta
 	global archive.file archive.path archive.fulldestpath
@@ -94,12 +94,6 @@
 	set skipped 0
 	if {[check_statefile target org.macports.archive $target_state_fd]} {
 		return 0
-	} elseif {[check_statefile target org.macports.unarchive $target_state_fd] && ([info exists ports_binary_only] && $ports_binary_only == "yes")} {
-		ui_debug "Skipping archive ($portname) since binary-only is set"
-		set skipped 1
-	} elseif {[info exists ports_source_only] && $ports_source_only == "yes"} {
-		ui_debug "Skipping archive ($portname) since source-only is set"
-		set skipped 1
 	} else {
 		set unsupported 0
 		set any_missing no

Modified: branches/images-and-archives/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portunarchive.tcl	2009-05-07 05:07:30 UTC (rev 50693)
+++ branches/images-and-archives/base/src/package1.0/portunarchive.tcl	2009-05-07 05:41:19 UTC (rev 50694)
@@ -62,7 +62,7 @@
 
 proc portunarchive::unarchive_init {args} {
 	global UI_PREFIX target_state_fd variations workpath
-	global ports_force ports_source_only ports_binary_only
+	global ports_force
 	global portname portversion portrevision portvariants portpath
 	global unarchive.srcpath unarchive.type unarchive.file unarchive.path unarchive.fullsrcpath
 
@@ -89,9 +89,6 @@
 	set skipped 0
 	if {[check_statefile target org.macports.unarchive $target_state_fd]} {
 		return 0
-	} elseif {[info exists ports_source_only] && $ports_source_only == "yes"} {
-		ui_debug "Skipping unarchive ($portname) since source-only is set"
-		set skipped 1
 	} elseif {[check_statefile target org.macports.destroot $target_state_fd]} {
 		ui_debug "Skipping unarchive ($portname) since destroot completed"
 		set skipped 1
@@ -119,16 +116,12 @@
 		if {$found == 1} {
 			ui_debug "Found [string toupper ${unarchive.type}] archive: ${unarchive.path}"
 		} else {
-			if {[info exists ports_binary_only] && $ports_binary_only == "yes"} {
-				return -code error "Archive for ${portname} ${portversion}_${portrevision}${portvariants} not found, required when binary-only is set!"
+			if {[llength [option portarchivetype]] == $unsupported} {
+				ui_debug "Skipping unarchive ($portname) since specified archive types not supported"
 			} else {
-				if {[llength [option portarchivetype]] == $unsupported} {
-					ui_debug "Skipping unarchive ($portname) since specified archive types not supported"
-				} else {
-					ui_debug "Skipping unarchive ($portname) since no archive found"
-				}
-				set skipped 1
+				ui_debug "Skipping unarchive ($portname) since no archive found"
 			}
+			set skipped 1
 		}
 	}
 	# Skip unarchive target by setting state

Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl	2009-05-07 05:07:30 UTC (rev 50693)
+++ branches/images-and-archives/base/src/port/port.tcl	2009-05-07 05:41:19 UTC (rev 50694)
@@ -3171,12 +3171,6 @@
                     R {
                         set global_options(ports_do_dependents) yes
                     }
-                    s {
-                        set global_options(ports_source_only) yes
-                    }
-                    b {
-                        set global_options(ports_binary_only) yes
-                    }
                     c {
                         set global_options(ports_autoclean) yes
                     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090506/5b26e7e0/attachment.html>