[152164] contrib/mp-buildbot

[larryv at macports.org]

Revision: 152164
          https://trac.macports.org/changeset/152164
Author:   larryv at macports.org
Date:     2016-08-30 14:59:26 -0700 (Tue, 30 Aug 2016)
Log Message:
-----------
mpbb: Rename "logdir" to "log_dir"

In option names, consistently separate words with underscores (e.g.,
"option_staging_dir").

Modified Paths:
--------------
    contrib/mp-buildbot/mpbb
    contrib/mp-buildbot/mpbb-install-dependencies
    contrib/mp-buildbot/mpbb-install-port
    contrib/mp-buildbot/mpbb-list-subports

Modified: contrib/mp-buildbot/mpbb
===================================================================
--- contrib/mp-buildbot/mpbb	2016-08-30 20:50:48 UTC (rev 152163)
+++ contrib/mp-buildbot/mpbb	2016-08-30 21:59:26 UTC (rev 152164)
@@ -24,7 +24,7 @@
 option_svn_revision=$option_default_svn_revision
 option_svn_url=$option_default_svn_url
 option_work_dir=$option_default_work_dir
-option_logdir="${option_work_dir}/logs"
+option_log_dir="${option_work_dir}/logs"
 
 # Print $0 and arguments to standard error.
 # Unset IFS to ensure "$*" uses spaces as separators.
@@ -160,7 +160,7 @@
                     ;;
                 --work-dir)
                     option_work_dir=$2
-                    option_logdir="${option_work_dir}/logs"
+                    option_log_dir="${option_work_dir}/logs"
                     shift
                     ;;
                 --)

Modified: contrib/mp-buildbot/mpbb-install-dependencies
===================================================================
--- contrib/mp-buildbot/mpbb-install-dependencies	2016-08-30 20:50:48 UTC (rev 152163)
+++ contrib/mp-buildbot/mpbb-install-dependencies	2016-08-30 21:59:26 UTC (rev 152164)
@@ -27,13 +27,13 @@
     local dependencies
     local dependencies_count
     local dependencies_counter
-    # $option_logdir is set in mpbb
+    # $option_log_dir is set in mpbb
     # shellcheck disable=SC2154
-    local log_status_dependencies="${option_logdir}/dependencies-progress.txt"
-    local log_subports_progress="${option_logdir}/ports-progress.txt"
+    local log_status_dependencies="${option_log_dir}/dependencies-progress.txt"
+    local log_subports_progress="${option_log_dir}/ports-progress.txt"
 
     # prepare the log file and make sure to start with an empty one
-    mkdir -p "${option_logdir}"
+    mkdir -p "${option_log_dir}"
     > "$log_status_dependencies"
 
     # calculate list of dependencies in-order

Modified: contrib/mp-buildbot/mpbb-install-port
===================================================================
--- contrib/mp-buildbot/mpbb-install-port	2016-08-30 20:50:48 UTC (rev 152163)
+++ contrib/mp-buildbot/mpbb-install-port	2016-08-30 21:59:26 UTC (rev 152164)
@@ -24,15 +24,15 @@
         err "Must specify a port"
         return 1
     fi
-    # $option_logdir is set in mpbb
+    # $option_log_dir is set in mpbb
     # shellcheck disable=SC2154
-    local log_port_contents="${option_logdir}/port-contents.txt"
-    local log_port_stats="${option_logdir}/port-statistics.txt"
-    local log_port_main="${option_logdir}/main.log"
-    local log_subports_progress="${option_logdir}/ports-progress.txt"
+    local log_port_contents="${option_log_dir}/port-contents.txt"
+    local log_port_stats="${option_log_dir}/port-statistics.txt"
+    local log_port_main="${option_log_dir}/main.log"
+    local log_subports_progress="${option_log_dir}/ports-progress.txt"
 
     # prepare the log files and make sure to start with empty ones
-    mkdir -p "${option_logdir}"
+    mkdir -p "${option_log_dir}"
     #> "$log_port_contents"
     > "$log_port_stats"
 

Modified: contrib/mp-buildbot/mpbb-list-subports
===================================================================
--- contrib/mp-buildbot/mpbb-list-subports	2016-08-30 20:50:48 UTC (rev 152163)
+++ contrib/mp-buildbot/mpbb-list-subports	2016-08-30 21:59:26 UTC (rev 152164)
@@ -19,7 +19,7 @@
     local exclude
     local exclude_reasons
     local reason
-    # $option_logdir is set in mpbb
+    # $option_log_dir is set in mpbb
     # shellcheck disable=SC2154
 
     os_version="$(sw_vers -productVersion | cut -d . -f 1-2)"
@@ -69,9 +69,9 @@
 }
 
 list-subports() {
-    # $option_logdir is set in mpbb
+    # $option_log_dir is set in mpbb
     # shellcheck disable=SC2154
-    local log_subports_progress="${option_logdir}/ports-progress.txt"
+    local log_subports_progress="${option_log_dir}/ports-progress.txt"
 
     if [ $# -le 0 ] && [ -z "${option_port:-}" ]; then
         err "Must specify at least one port"
@@ -81,7 +81,7 @@
     success=0
 
     # prepare the log file and make sure to start with an empty one
-    mkdir -p "$option_logdir"
+    mkdir -p "$option_log_dir"
     > "$log_subports_progress"
 
     if [ -n "${option_port}" ]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160830/4036c376/attachment.html>