[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 5574720ea7d5ddb7b4ee42cd21c480df927ab813
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sat Dec 6 21:11:38 2008 +0100

    setup.py: ship the new file

diff --git a/framework/subsystems/ogsmd/gsm/const.py b/framework/subsystems/ogsmd/gsm/const.py
index ef142e6..760d977 100644
--- a/framework/subsystems/ogsmd/gsm/const.py
+++ b/framework/subsystems/ogsmd/gsm/const.py
@@ -16,8 +16,7 @@ GSM constants, strings, formats, parse patterns, timeouts, you name it.
 from framework import config
 from ogsmd.helpers import BiDict
 
-import re
-import string
+import re, string, os.path
 
 import logging
 logger = logging.getLogger( "ogsmd" )
@@ -1114,13 +1113,14 @@ def codeToOperator( mccmni ):
         operator = codeToOperatorCache[code]
     except KeyError:
         mcc, mni = code[:3], code[3:]
-        for line in file( codeToOperatorFile, "r" ):
-            if line.startswith( mcc ):
-                tokens = line.split()
-                if tokens[1] == mni:
-                    operator = tokens[2]
-                    codeToOperatorCache[code] = operator
-                    return operator
+        if os.path.exists( codeToOperatorFile ):
+            for line in file( codeToOperatorFile, "r" ):
+                if line.startswith( mcc ):
+                    tokens = line.split()
+                    if tokens[1] == mni:
+                        operator = tokens[2]
+                        codeToOperatorCache[code] = operator
+                        return operator
         operator = "%s-%s" % ( mcc, mni )
         codeToOperatorCache[code] = operator
     return operator
diff --git a/setup.py b/setup.py
index b7fbd74..62fb350 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ packages = [ x[0] for x in os.walk( "framework" ) ]
 
 setup(
     name = "The FreeSmartphone Framework Daemon",
-    version = "milestone1+git",
+    version = "0.8.4.8",
     author = "Michael 'Mickey' Lauer et. al.",
     author_email = "mlauer at vanille-media.de",
     url = "http://www.freesmartphone.org",
@@ -24,16 +24,17 @@ setup(
     scripts = [ "framework/frameworkd", "tools/cli-framework" ],
     data_files = [
         ("../../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ),
-        ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/phone.yaml"]),
-        ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/profiles.yaml"]),
-        ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/rules.yaml"]),
-        ("../../etc/freesmartphone/opreferences/conf/profiles/", ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]),
-        ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]),
-        ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]),
-        ("../../etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/default.yaml"]),
-        ("../../etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/silent.yaml"]),
-        ("../../etc/freesmartphone/oevents", ["etc/freesmartphone/oevents/rules.yaml"]),
-        ("../../etc/freesmartphone/persist", ["etc/freesmartphone/persist/README"]),
+        ("../../etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/phone.yaml"]),
+        ("../../etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/profiles.yaml"]),
+        ("../../etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/rules.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/profiles/",  ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/default.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/silent.yaml"]),
+        ("../../etc/freesmartphone/oevents",                      ["etc/freesmartphone/oevents/rules.yaml"]),
+        ("../../etc/freesmartphone/persist",                      ["etc/freesmartphone/persist/README"]),
+        ("../../etc/freesmartphone/ogsmd",                        ["etc/freesmartphone/ogsmd/mobile_network_code"]),
         ("freesmartphone/examples/", getDir( "examples" ) ),
     ]
 )

-- 
FSO frameworkd Debian packaging