[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1492-g30145e6

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  30145e67eb9eca90a5ed7dc7fdc940a33dcd6c40 (commit)
      from  3f35eb769777c30161f6737f81fd51b322441f2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=30145e67eb9eca90a5ed7dc7fdc940a33dcd6c40


commit 30145e67eb9eca90a5ed7dc7fdc940a33dcd6c40
Author: Rob Savoye <address@hidden>
Date:   Sat May 5 19:04:10 2012 -0600

    move error message so we only get one.

diff --git a/libbase/Socket.cpp b/libbase/Socket.cpp
index 5fc6160..6b66984 100644
--- a/libbase/Socket.cpp
+++ b/libbase/Socket.cpp
@@ -159,14 +159,12 @@ Socket::connect(const std::string& hostname, 
boost::uint16_t port)
     // getaddrinfo() is sensitive to how localhost is defined in
     // /etc/hosts. Whatever hostname is, needs to match the entry in
     // the hosts file. Localhost is usually only used for debug and
-    // and testing, all other hostnames aere fully qualified. Anyway,
+    // and testing, all other hostnames are fully qualified. Anyway,
     // this causes our XMLSocketTester test case to fail since not
     // all build slaves have the same entry for localhost in their
     // hosts file.
     code = getaddrinfo(hostname.c_str(), 0, &req, &ans);
     if (code != 0) {
-        log_error(_("getaddrinfo() failed with code: #%d - %s\n"),
-                  code, gai_strerror(code));
         if (code == EAI_NONAME) {
             std::string localhost;
             if (hostname == "localhost") {
@@ -179,8 +177,10 @@ Socket::connect(const std::string& hostname, 
boost::uint16_t port)
                           code, gai_strerror(code));
                 return false;
             }
-            log_error(_("getaddrinfo() needed to change localhost"));
+            log_error(_("getaddrinfo() needed to change localhost, edit your 
/etc/host file!"));
         } else {
+            log_error(_("getaddrinfo() failed with code: #%d - %s\n"),
+                      code, gai_strerror(code));
             return false;
         }
     }

-----------------------------------------------------------------------

Summary of changes:
 libbase/Socket.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash