fix crash when updating plugin list.

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 7ec9c0d..0ed67d6 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -82,7 +82,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"

-PR = "r0"
+PR = "r1"

 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision


@@ -105,6 +105,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
            file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \

+          file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \

            file://MyriadPro-Regular.otf \
            file://MyriadPro-Semibold.otf \
            file://MyriadPro-SemiboldIt.otf \
            file://MyriadPro-Regular.otf \
            file://MyriadPro-Semibold.otf \
            file://MyriadPro-SemiboldIt.otf \

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_wirelessaccesspoint.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_wirelessaccesspoint.patch
deleted file mode 100644 (file)
index 24f1c61..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_wirelessaccesspoint.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 982c734fd5a2f7488667005f0a926042022e28e0
-Author: Chang.H.S <jhs@dev3>
-Date:   Wed Dec 5 14:15:05 2012 +0900
-
-    wirelessAccessPoint : fix to continue commented lines on sysctl.conf
-
-diff --git a/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py
-index ff6849d..223dcea 100755
---- a/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py
-+++ b/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py
-@@ -522,11 +522,14 @@ class WirelessAccessPoint(Screen,ConfigListScreen):
-                       fp.close()
-               sysctlList = {}
-               for line in sysctlLines:
--                      line = line.strip()
--                      (key,value) = line.split("=")
--                      key=key.strip()
--                      value=value.strip()
--                      sysctlList[key] = value
-+                      try:
-+                              line = line.strip()
-+                              (key,value) = line.split("=")
-+                              key=key.strip()
-+                              value=value.strip()
-+                              sysctlList[key] = value
-+                      except:
-+                              continue
-               sysctlList["net.ipv4.ip_forward"] = str(setValue)
-               fp = file(sysctlPath, "w")
-               for (key,value) in sysctlList.items():