Changeset 83270

Timestamp:

08/29/11 05:55:50 (4 years ago)

Author:

jmr@…

Message:

don't warn about old ports tree if running selfupdate or sync (#23094)

Location:

trunk/base/src

Files:

• macports1.0/macports.tcl (modified) (1 diff)
• port/port.tcl (modified) (1 diff)

trunk/base/src/macports1.0/macports.tcl

@@ -964 +964 @@
     _mports_load_quickindex
 
-    set default_source_url [lindex ${sources_default} 0]
-    if {[macports::getprotocol $default_source_url] == "file" || [macports::getprotocol $default_source_url] == "rsync"} {
-        set default_portindex [macports::getindex $default_source_url]
-        if {[file exists $default_portindex] && [expr [clock seconds] - [file mtime $default_portindex]] > 1209600} {
-            ui_warn "port definitions are more than two weeks old, consider using selfupdate"
-        }
-    }
-    
+    if {![info exists macports::ui_options(ports_no_old_index_warning)]} {
+        set default_source_url [lindex ${sources_default} 0]
+        if {[macports::getprotocol $default_source_url] == "file" || [macports::getprotocol $default_source_url] == "rsync"} {
+            set default_portindex [macports::getindex $default_source_url]
+            if {[file exists $default_portindex] && [expr [clock seconds] - [file mtime $default_portindex]] > 1209600} {
+                ui_warn "port definitions are more than two weeks old, consider using selfupdate"
+            }
+        }
+    }
+
     # init registry
     set db_path [file join ${registry.path} registry registry.db]

trunk/base/src/port/port.tcl

@@ -4681 +4681 @@
 if { [llength $remaining_args] == 0 && ![info exists ui_options(ports_commandfiles)] } {
     lappend ui_options(ports_commandfiles) -
+} elseif {[lookahead] == "selfupdate" || [lookahead] == "sync"} {
+    # tell mportinit not to tell the user they should selfupdate
+    set ui_options(ports_no_old_index_warning) 1
 }