Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

wp-cli install-network should treat a wildcard DNS error as a warning #346

Merged
merged 2 commits into from

2 participants

Andrew Nacin Cristi Burcă
Cristi Burcă scribu merged commit 84e5752 into from
Cristi Burcă
Owner

Merged; thanks.

Andrew Nacin nacin deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 3 deletions.
  1. +6 −2 php/commands/core.php
  2. +1 −1  utils/update-phar
8 php/commands/core.php
View
@@ -133,8 +133,12 @@ public function install_network( $args, $assoc_args ) {
$result = populate_network( 1, $hostname, get_option( 'admin_email' ), $assoc_args['title'], $base, $subdomain_install );
- if ( is_wp_error( $result ) )
- WP_CLI::error( $result );
+ if ( is_wp_error( $result ) ) {
+ if ( $result->get_error_codes() === array( 'no_wildcard_dns' ) )
+ WP_CLI::warning( __( 'Wildcard DNS may not be configured correctly.' ) );
+ else
+ WP_CLI::error( $result );
+ }
ob_start();
?>
2  utils/update-phar
View
@@ -20,7 +20,7 @@ php $fname --version
# check which wp-cli commit the previous Phar archive was based on
# can't use the md5 hash, since it will be different each time the
# archive is generated
-new_commit_subj="update wp-cli.phar to $current_rev"
+new_commit_subj="update wp-cli.phar to wp-cli/wp-cli@$current_rev"
current_commit_subj=$(git show -s --pretty=format:%s HEAD)
Something went wrong with that request. Please try again.