summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Sapp <nixphoeni@gentoo.org>2010-05-08 19:04:24 +0000
committerJoe Sapp <nixphoeni@gentoo.org>2010-05-08 19:04:24 +0000
commit339ca5ef0ad5200583226ee1038bc21357799393 (patch)
tree18e6123d2d6757a9fee36a397909ea8a9061544d /gnome-extra/gdesklets-core/files
parentTried to fix bug #314653 (diff)
downloadhistorical-339ca5ef0ad5200583226ee1038bc21357799393.tar.gz
historical-339ca5ef0ad5200583226ee1038bc21357799393.tar.bz2
historical-339ca5ef0ad5200583226ee1038bc21357799393.zip
Added patch to try to fix bug #314653
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/gdesklets-core/files')
-rwxr-xr-xgnome-extra/gdesklets-core/files/gdesklets-control-getid14
-rw-r--r--gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch14
2 files changed, 19 insertions, 9 deletions
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
index f16771ad805b..9d55d0a5a542 100755
--- a/gnome-extra/gdesklets-core/files/gdesklets-control-getid
+++ b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
@@ -1,7 +1,7 @@
#!/usr/bin/env python2
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.4 2010/05/08 03:20:21 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.5 2010/05/08 19:04:24 nixphoeni Exp $
#
# A simple script to get the name and id from a Control.
# Pretty much copied from test-control.py
@@ -18,20 +18,16 @@ try:
path = os.path.abspath(sys.argv[1])
folder, base = os.path.split(path)
except:
- #sys.exit("Usage: gdesklets-control-getid <control-directory>")
- print "ERROR_IN_CONTROL_INSTALLATION"
-
+ sys.exit("ERROR IN CONTROL INSTALLATION")
+
os.chdir(folder)
try:
module = __import__(base)
- os.chdir(base)
clss = module.get_class()
- ctrl = clss()
-
+
except IOError:
- #sys.exit("Could not load control %s." % (path))
- print folder
+ sys.exit("Could not load control in %s!" % (folder))
# Get the string in the form of "IMyControl:hash" and translate it to
# "MyControl_hash"
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
new file mode 100644
index 000000000000..ae458a3bb2b1
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
@@ -0,0 +1,14 @@
+--- main/__init__.py 2009-09-20 20:02:48 +0000
++++ main/__init__.py 2010-05-08 15:41:26 +0000
+@@ -16,8 +16,11 @@
+ # case the DISPLAY variable doesn't contain the screen number)
+ DISPLAY = vfs.escape_path(gtk.gdk.Display(os.environ["DISPLAY"]).get_name()).replace("/", "_")
+ except:
+- print "Error: could not open display", os.environ["DISPLAY"]
+- sys.exit(1)
++ try:
++ print >> sys.stderr, "Error: could not open display", os.environ["DISPLAY"]
++ except:
++ print >> sys.stderr, "(could not get DISPLAY environment variable)"
++ DISPLAY = "0"
+