Changeset 4481 for trunk/base

Timestamp:

Jan 6, 2004, 9:47:33 AM (20 years ago)

Author:

jkh

Message:

Fix conflict between extract_suffix and use_bzip2 by making both use
the same work procedure.
Bug: 788
Submitted by: Toby Peterson <tp62@…>

File:

• trunk/base/src/port1.0/portfetch.tcl (modified) (2 diffs)

trunk/base/src/port1.0/portfetch.tcl

@@ -71 +71 @@
 
 # Option-executed procedures
-namespace eval options { }
-proc options::use_bzip2 {args} {
-    global use_bzip2 extract.suffix
-    if {[tbool use_bzip2]} {
-        set extract.suffix .tar.bz2
-    }
-}
-
-proc options::use_zip {args} {
-    global use_zip extract.suffix
-    if {[tbool use_zip]} {
-        set extract.suffix .zip
+option_proc use_bzip2 fix_extract_suffix
+option_proc use_zip fix_extract_suffix
+
+proc fix_extract_suffix {option action args} {
+    global extract.suffix
+    if {[string equal ${action} "set"] && [tbool args]} {
+        switch $option {
+            use_bzip2 {
+                set extract.suffix .tar.bz2
+            }
+            use_zip {
+                set extract.suffix .zip
+            }
+        }
     }
 }
@@ -94 +96 @@
 # Given a distname, return a suffix based on the use_zip / use_bzip2 / extract.suffix options
 proc suffix {distname} {
-    global extract.suffix use_bzip2 use_zip fetch.type
+    global extract.suffix fetch.type
     if {"${fetch.type}" == "cvs"} {
         return ""
     }
-    if {[tbool use_bzip2]} {
-        return ${distname}.tar.bz2
-    } elseif {[tbool use_zip]} {
-        return ${distname}.zip
-    } else {
-        return ${distname}${extract.suffix}
-    }
+    return ${distname}${extract.suffix}
 }