diff options
| author | Klaus Kurzmann <mok@fluxnetz.de> | 2010-05-21 22:11:46 +0200 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2010-05-21 22:11:46 +0200 |
| commit | 74228420b99243aff77a90604ff774d2487c0b02 (patch) | |
| tree | af52680d83f6c9a2a3fe8f970ba74c8a163bea91 /recipes | |
| parent | d1b03808e6b4377e0ce0d9d4ac4a2849d56ba41f (diff) | |
openbmap-logger_0.4.0.bb: add a patch to make it compatible with fsogsmd
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch | 22 | ||||
| -rw-r--r-- | recipes/openbmap/openbmap-logger_0.4.0.bb | 7 |
2 files changed, 27 insertions, 2 deletions
diff --git a/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch b/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch new file mode 100644 index 0000000000..93da2a6dc0 --- /dev/null +++ b/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch @@ -0,0 +1,22 @@ +diff -uri openbmap-logger-0.4.0/openbmap/logger.py openbmap-logger-0.4.0-fsogsmd/openbmap/logger.py +--- openbmap-logger-0.4.0/openbmap/logger.py 2009-07-20 19:07:43.000000000 +0200 ++++ openbmap-logger-0.4.0-fsogsmd/openbmap/logger.py 2010-05-21 22:00:02.024118210 +0200 +@@ -220,7 +220,10 @@ + """If available, returns the manufacturer, model and revision.""" + #TODO call the dBus interface only if instance attributes are not set. + obj = dbus.SystemBus().get_object('org.freesmartphone.ogsmd', '/org/freesmartphone/GSM/Device') +- data = dbus.Interface(obj, 'org.freesmartphone.GSM.Device').GetInfo() ++ try: ++ data = dbus.Interface(obj, 'org.freesmartphone.GSM.Device').GetInfo() ++ except: ++ data = dbus.Interface(obj, 'org.freesmartphone.Info').GetInfo() + if 'manufacturer' in data: + # At the moment the returned string starts and ends with '"' for model and revision + self._manufacturer = data['manufacturer'].strip('"') +@@ -1392,4 +1395,4 @@ + mainloop.quit() + else: + logging.info("normal exit.") +- sys.exit( 0 ) +\ Kein Zeilenumbruch am Dateiende. ++ sys.exit( 0 ) diff --git a/recipes/openbmap/openbmap-logger_0.4.0.bb b/recipes/openbmap/openbmap-logger_0.4.0.bb index fa7e6c9726..bbaec472eb 100644 --- a/recipes/openbmap/openbmap-logger_0.4.0.bb +++ b/recipes/openbmap/openbmap-logger_0.4.0.bb @@ -1,8 +1,11 @@ DESCRIPTION = "openBmap logger and uploader of GPS/GSM data" SECTION = "x11/utils" -PR = "r0" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz" +SRC_URI = "\ +${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz \ +file://fsogsmd-fix.patch;patch=1 \ +" inherit distutils |