Misc patches

That's Terminal on Fedora and xfce4-terminal on Ubuntu/Debian... This could get interesting!

Signed-off-by Joshua Lock <[email protected]>

---
 meta/lib/oe/terminal.py |   21 +++++++++++++++++++++

 1 files changed, 21 insertions(+), 0 deletions(-)

meta/lib/oe/terminal.py +0 -0

index 1455e8e..b90a1f2 100644
@@ -57,6 +57,27 @@ class Gnome(XTerminal):

    command = 'gnome-terminal --disable-factory -t "{title}" -x {command}' priority = 2

meta/lib/oe/terminal.py +10 -0

+class Xfce(XTerminal):
+    def distro_name():
+        import subprocess as sub
+        try:
+            p = sub.Popen(['lsb_release', '-i'], stdout=sub.PIPE,
+                          stderr=sub.PIPE)
+            out, err = p.communicate()
+            distro = out.split(':').strip()
+        except:
+            distro = "unknown"

Quoted 26 lines · Joshua Lock

That's Terminal on Fedora and xfce4-terminal on Ubuntu/Debian... This could get interesting!

Signed-off-by Joshua Lock <[email protected]>

---
 meta/lib/oe/terminal.py |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

meta/lib/oe/terminal.py +10 -0

index 1455e8e..b90a1f2 100644
@@ -57,6 +57,27 @@ class Gnome(XTerminal):
    command = 'gnome-terminal --disable-factory -t "{title}" -x {command}'
    priority = 2
 
+class Xfce(XTerminal):
+    def distro_name():
+        import subprocess as sub
+        try:
+            p = sub.Popen(['lsb_release', '-i'], stdout=sub.PIPE,
+                          stderr=sub.PIPE)
+            out, err = p.communicate()
+            distro = out.split(':').strip()
+        except:
+            distro = "unknown"

meta/lib/oe/terminal.py class Gnome(XTerminal): · line 79

Quoted 10 lines

meta/lib/oe/terminal.py +10 -0

+        return distro
+
+    # Upstream binary name is Terminal but Debian/Ubuntu use
+    # xfce4-terminal to avoid possible(?) conflicts
+    distro = distro_name()
+    if distro == 'Ubuntu' or distro == 'Debian':
+        command = 'xfce4-terminal -T "{title}" -e "{command}"'
+    else:
+        command = 'Terminal -T "{title}" -e "{command}"'
+    priority = 2

The first problem I see with this is you're calling lsb_release at module import time. Doing things like that is generally a no-no. I'd suggest shifting it into the constructor. Set up the command there as

self.command, and be sure to call the superclass constructor as well, after the command bits. The other thing is, and I'm sure you just copied & pasted it from konsole, but we already import a fully functional Popen -- it's the superclass of all the terminal classes. So there's no need to pull in subprocess's version of it. And the defaults of the Popen we use ensure the output is captured, so there's no need for the sub.PIPE bits at all if you use that one. Simply do p = Popen(['lsb_release', '-i']).

Thanks for adding this, I'm sure folks using stock Xubuntu and the like will find this helpful (I'm an rxvt-unicode guy myself).

A series of minor tweaks from my disk. The XFCE support in oe.terminal has only been tested on a Fedora machine so I would appreciate testing from XFCE users on other distros.

Regards,

Joshua

The following changes since commit ddc9a58b8553599d2328ac1c4449b41681ae45d1:

Add readline as dependecy for gdb-cross-canadian (2011-10-27 08:37:53 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/work
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/work

Joshua Lock (4):
lib/oe/terminal: add support for XFCE's terminal emulator
libxslt: Fix packaging of xsltConf.sh
libcanberra: add new package for unpackaged files
clutter-gtk: add LIC_FILES_CHKSUM to include file