Print hostname in xterm title if HOSTNAME is exported in the environment (trunk r5976)

svn path=/main/branches/2.1.2/; revision=6929

diff --git a/bin/emerge b/bin/emerge
index 3ba0e9e5142e5653ca425e08c097358a58df3474..4e3197bf0f334461d39e5740559ed6ece076e4f8 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -204,10 +204,11 @@ shortmapping={
 
 def emergelog(xterm_titles, mystr, short_msg=None):
        if xterm_titles:
-               if short_msg:
-                       xtermTitle(short_msg)
-               else:
-                       xtermTitle(mystr)
+               if short_msg == None:
+                       short_msg = mystr
+               if "HOSTNAME" in os.environ:
+                       short_msg = os.environ["HOSTNAME"]+": "+short_msg
+               xtermTitle(short_msg)
        try:
                file_path = "/var/log/emerge.log"
                mylogfile = open(file_path, "a")