[backfire] merge r22561

package/comgt: only set pincode if it's supplied (closes: #7334), bump release number

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22562 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 37d5ca6..adef161 100644 (file)
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/comgt

diff --git a/package/comgt/files/3g.sh b/package/comgt/files/3g.sh
index 59e99c7..b1ce2ab 100644 (file)
--- a/package/comgt/files/3g.sh
+++ b/package/comgt/files/3g.sh
@@ -91,10 +91,12 @@ setup_interface_3g() {
                fi
                # Don't assume Option to be default as it breaks with Huawei Cards/Sticks
 
-               PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || {
-                       echo "$config(3g): Failed to set the PIN code."
-                       set_3g_led 0 0 0
-                       return 1
+               test -z "$pincode" || {
+                       PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || {
+                               echo "$config(3g): Failed to set the PIN code."
+                               set_3g_led 0 0 0
+                               return 1
+                       }
                }
                test -z "$mode" || {
                        MODE="$mode" gcom -d "$device" -s /etc/gcom/setmode.gcom