[124307] trunk/base

[jmr at macports.org]

Revision: 124307
          https://trac.macports.org/changeset/124307
Author:   jmr at macports.org
Date:     2014-08-22 08:38:20 -0700 (Fri, 22 Aug 2014)
Log Message:
-----------
add macports.conf option corresponding to the -N flag

Modified Paths:
--------------
    trunk/base/doc/macports.conf.in
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in	2014-08-22 14:52:47 UTC (rev 124306)
+++ trunk/base/doc/macports.conf.in	2014-08-22 15:38:20 UTC (rev 124307)
@@ -199,3 +199,6 @@
 # removing unnecessary files and directories prior to pkg or mpkg
 # deployment.
 #pkg_post_unarchive_deletions	include share/doc share/man
+
+# Whether the user interface should ask interactive questions
+#ui_interactive         yes

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2014-08-22 14:52:47 UTC (rev 124306)
+++ trunk/base/src/macports1.0/macports.tcl	2014-08-22 15:38:20 UTC (rev 124307)
@@ -53,7 +53,7 @@
         master_site_local patch_site_local archive_site_local buildfromsource \
         revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \
         host_blacklist preferred_hosts sandbox_enable delete_la_files cxx_stdlib \
-        packagemaker_path default_compilers pkg_post_unarchive_deletions"
+        packagemaker_path default_compilers pkg_post_unarchive_deletions ui_interactive"
     variable user_options {}
     variable portinterp_options "\
         portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
@@ -875,6 +875,12 @@
         }
     }
 
+    # Set noninteractive mode if specified in config
+    if {[info exists ui_interactive] && !$ui_interactive} {
+        set macports::ui_options(ports_noninteractive) yes
+        unset -nocomplain macports::ui_options(questions_yesno) macports::ui_options(questions_singlechoice) macports::ui_options(questions_multichoice)
+    }
+
     # Archive type, what type of binary archive to use (CPIO, gzipped
     # CPIO, XAR, etc.)
     global macports::portarchivetype
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140822/3ed718ab/attachment.html>