Andrew Bogott has submitted this change and it was merged.

Change subject: Fix one error message, remove another bogus one.
......................................................................


Fix one error message, remove another bogus one.

Change-Id: Ibc2a41e14c0b8544cbfe9f98f9550b5c70476d95
---
M nova/OpenStackNovaHost.php
1 file changed, 3 insertions(+), 5 deletions(-)

Approvals:
  Andrew Bogott: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/nova/OpenStackNovaHost.php b/nova/OpenStackNovaHost.php
index fbce8d8..991bea8 100644
--- a/nova/OpenStackNovaHost.php
+++ b/nova/OpenStackNovaHost.php
@@ -96,11 +96,9 @@
        function getFullyQualifiedDisplayName() {
                global $wgAuth;
 
-               if ( $this->public ) {
+               if ( ! $this->private ) {
                        $wgAuth->printDebug( "getFullyQualifiedDisplayName 
called on public host, so this will probably break.", NONSENSITIVE );
                }
-
-               $wgAuth->printDebug( "Error: Unable to determine instancename 
of " . $this->searchvalue, NONSENSITIVE );
 
                if ( isset( $this->hostInfo[0]['associateddomain'] ) ) {
                        $domains = $this->hostInfo[0]['associateddomain'];
@@ -118,7 +116,7 @@
                        }
                }
 
-               $wgAuth->printDebug( "Error: Unable to determine instancename 
of " . $this->searchvalue, NONSENSITIVE );
+               $wgAuth->printDebug( "Error: Unable to determine instancename 
of " . $this->instanceid, NONSENSITIVE );
                return "";
        }
 
@@ -168,7 +166,7 @@
        function getFullyQualifiedHostName() {
                global $wgAuth;
 
-               if ( $this->public ) {
+               if ( ! $this->private ) {
                        $wgAuth->printDebug( "getFullyQualifiedDisplayName 
called on a public host; this will probably break.", NONSENSITIVE );
                }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc2a41e14c0b8544cbfe9f98f9550b5c70476d95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to