--- pym/output.py +++ pym/output.py @@ -5,6 +5,8 @@ import os,sys,re +import portage + havecolor=1 dotitles=1 @@ -99,7 +101,7 @@ if (myt in legal_terms) or myt.startswith("xterm") or myt.startswith("screen"): sys.stderr.write("\x1b]2;"+str(mystr)+"\x07") sys.stderr.flush() - if (myt.startswith("screen")): + if (myt.startswith("screen") and ("screentitle" in portage.features)): sys.stderr.write("\x1bk"+str(mystr)+"\x1b\\") sys.stderr.flush() --- cnf/make.conf +++ cnf/make.conf @@ -290,6 +290,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -297,7 +298,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.alpha +++ cnf/make.conf.alpha @@ -276,6 +276,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -283,7 +284,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.amd64 +++ cnf/make.conf.amd64 @@ -287,6 +287,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -294,7 +295,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.arm +++ cnf/make.conf.arm @@ -284,6 +284,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -291,7 +292,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.hppa +++ cnf/make.conf.hppa @@ -293,6 +293,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -300,7 +301,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.ia64 +++ cnf/make.conf.ia64 @@ -255,6 +255,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -262,7 +263,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.mips +++ cnf/make.conf.mips @@ -273,6 +273,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -280,7 +281,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.ppc +++ cnf/make.conf.ppc @@ -306,6 +306,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -313,7 +314,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.ppc64 +++ cnf/make.conf.ppc64 @@ -291,6 +291,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -298,7 +299,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.sparc +++ cnf/make.conf.sparc @@ -291,6 +291,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -298,7 +299,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is --- cnf/make.conf.x86 +++ cnf/make.conf.x86 @@ -290,6 +290,7 @@ # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'screentitle' enables screen title updates (if notitles is not set) # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. @@ -297,7 +298,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles screentitle noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is