[152163] contrib/mp-buildbot

[larryv at macports.org]

Revision: 152163
          https://trac.macports.org/changeset/152163
Author:   larryv at macports.org
Date:     2016-08-30 13:50:48 -0700 (Tue, 30 Aug 2016)
Log Message:
-----------
mpbb: Remove "--variants" option

Variants will be passed in the positional parameters along with port
names. Not implemented yet.

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

Modified: contrib/mp-buildbot/mpbb
===================================================================
--- contrib/mp-buildbot/mpbb	2016-08-30 20:50:45 UTC (rev 152162)
+++ contrib/mp-buildbot/mpbb	2016-08-30 20:50:48 UTC (rev 152163)
@@ -8,7 +8,6 @@
 option_default_archive_site=https://packages.macports.org
 option_default_help=0
 option_default_port=
-option_default_variants=
 option_default_prefix=/opt/local
 option_default_staging_dir=${PWD:-/tmp/mp-buildbot}/archive-staging
 option_default_svn=$(which svn)
@@ -19,7 +18,6 @@
 option_archive_site=$option_default_archive_site
 option_help=$option_default_help
 option_port=$option_default_port
-option_variants=$option_default_variants
 option_prefix=$option_default_prefix
 option_staging_dir=$option_default_staging_dir
 option_svn=$option_default_svn
@@ -52,10 +50,6 @@
  --help
    Print this usage message.
 
- --variants VARIANTS
-   An optional string with port variants (empty by default; not fully
-   functional yet).
-
  --prefix PREFIX
    The prefix of the MacPorts installation that will build the ports. Defaults
    to $option_default_prefix.
@@ -144,10 +138,6 @@
                     option_port=$2
                     shift
                     ;;
-                --variants)
-                    option_variants=$2
-                    shift
-                    ;;
                 --prefix)
                     option_prefix=$2
                     shift

Modified: contrib/mp-buildbot/mpbb-install-dependencies
===================================================================
--- contrib/mp-buildbot/mpbb-install-dependencies	2016-08-30 20:50:45 UTC (rev 152162)
+++ contrib/mp-buildbot/mpbb-install-dependencies	2016-08-30 20:50:48 UTC (rev 152163)
@@ -39,7 +39,7 @@
     # calculate list of dependencies in-order
     # $option_prefix and $thisdir are set in mpbb
     # shellcheck disable=SC2154
-    dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "$port" "${option_variants}")
+    dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "$port")
     if [ $? -ne 0 ]; then
         echo "Calculating dependencies for '$port' failed, aborting." >&2
         echo "Building '$port' ... [ERROR] (failed to calculate dependencies) maintainers: $(get-maintainers "$port")." >> "$log_subports_progress"
@@ -69,7 +69,7 @@
         echo -n "${text} ... " >> "$log_status_dependencies"
         # $depvariants isn't quoted on purpose
         # shellcheck disable=SC2086
-        if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants ${option_variants}; then
+        if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
             echo "Build of dependency '${depname}' failed, aborting." >&2
             echo "[FAIL]" >> "$log_status_dependencies"
             echo "Building '$port' ... [ERROR] (failed to install dependency '${depname}') maintainers: $(get-maintainers "$port" "${depname}")." >> "$log_subports_progress"

Modified: contrib/mp-buildbot/mpbb-install-port
===================================================================
--- contrib/mp-buildbot/mpbb-install-port	2016-08-30 20:50:45 UTC (rev 152162)
+++ contrib/mp-buildbot/mpbb-install-port	2016-08-30 20:50:48 UTC (rev 152163)
@@ -41,7 +41,7 @@
     time_start=$(date +%s)
     # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
-    if ! "${option_prefix}/bin/port" -dk install "$port" ${option_variants}; then
+    if ! "${option_prefix}/bin/port" -dk install "$port"; then
         echo "Build of '$port' failed."
         # log: summary for the portwatcher
         echo "Building '$port' ... [ERROR] maintainers: $(get-maintainers "$port")." >> "$log_subports_progress"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160830/bd7aa978/attachment-0001.html>