diff options
| author | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-25 02:08:58 (GMT) |
|---|---|---|
| committer | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-25 02:08:58 (GMT) |
| commit | c800ccbbf33893806ee6ef5ff9b19e3215148316 (patch) | |
| tree | 2af9314cc73cc9423b86edf2e46ca9ec86857e9e | |
| parent | 5a67a7abb172e4d6f6b270f9aa2ca7898ff36d1d (diff) | |
| parent | d71060dacbfa9249b2859a2cc3d25b27b19c8923 (diff) | |
Merge branch 'UY' of git://git.sugarlabs.org/dextrose/mainline into UY
| -rw-r--r-- | rpms/sugar/0146-sdxo-2361-Minor-fix-for-major-bug.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/rpms/sugar/0146-sdxo-2361-Minor-fix-for-major-bug.patch b/rpms/sugar/0146-sdxo-2361-Minor-fix-for-major-bug.patch new file mode 100644 index 0000000..ac69860 --- /dev/null +++ b/rpms/sugar/0146-sdxo-2361-Minor-fix-for-major-bug.patch @@ -0,0 +1,31 @@ +From 69edc342a56d8cbceda66baf9cdf35188e2aa58e Mon Sep 17 00:00:00 2001 +From: Ajay Garg <ajay@activitycentral.com> +Date: Sat, 22 Sep 2012 17:13:25 +0530 +Subject: [PATCH] sdxo#2361: Minor fix, for major bug :) +Organization: Sugar Labs Foundation +Signed-off-by: Ajay Garg <ajay@activitycentral.com> +--- + src/jarabe/journal/model.py | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py +index e0c0620..0192541 100644 +--- a/src/jarabe/journal/model.py ++++ b/src/jarabe/journal/model.py +@@ -73,11 +73,11 @@ SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME_PATH = \ + '/desktop/sugar/network/school_server_ip_address_or_dns_name' + + client = gconf.client_get_default() +-SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME = client.get_string(SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME_PATH) ++SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME = client.get_string(SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME_PATH) or '' + + + def is_school_server_present(): +- return not (SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME is None) ++ return not (SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME is '') + + + def _get_mount_point(path): +-- +1.7.4.4 + |