diff options
author | Ajay Garg <ajay@activitycentral.com> | 2012-09-27 18:56:46 (GMT) |
---|---|---|
committer | Ajay Garg <ajay@activitycentral.com> | 2012-09-27 18:56:46 (GMT) |
commit | 87e7ba8793c4939c728363096349ab5314e9a686 (patch) | |
tree | a94cf0a4ad9e09a75bbf4fe33ea6466bd61e1f59 | |
parent | cbc6fba10bc979cea82fc3cc2f706c0408d7b9e4 (diff) |
Removing duplicate code; instead using the "helper" misc.py class.
-rw-r--r-- | rpms/sugar/0150-Removing-duplicate-code-instead-using-the-helper-mis.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/rpms/sugar/0150-Removing-duplicate-code-instead-using-the-helper-mis.patch b/rpms/sugar/0150-Removing-duplicate-code-instead-using-the-helper-mis.patch new file mode 100644 index 0000000..ce297be --- /dev/null +++ b/rpms/sugar/0150-Removing-duplicate-code-instead-using-the-helper-mis.patch @@ -0,0 +1,65 @@ +From d205e48a0126b243e535dc2e4be605d5b5acc149 Mon Sep 17 00:00:00 2001 +From: Ajay Garg <ajay@activitycentral.com> +Date: Fri, 28 Sep 2012 00:24:31 +0530 +Subject: [PATCH] Removing duplicate code; instead using the "helper" misc.py class. +Organization: Sugar Labs Foundation +Signed-off-by: Ajay Garg <ajay@activitycentral.com> +--- + src/jarabe/journal/palettes.py | 34 +--------------------------------- + 1 files changed, 1 insertions(+), 33 deletions(-) + +diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py +index 72a06b1..0140edf 100644 +--- a/src/jarabe/journal/palettes.py ++++ b/src/jarabe/journal/palettes.py +@@ -1015,7 +1015,7 @@ class SchoolServerMenu(BaseCopyMenuItem): + # Attach the info of the uploader. + from jarabe.model.buddy import get_owner_instance + metadata['uploader-nick'] = get_owner_instance().props.nick +- metadata['uploader-serial'] = self.__get_serial_number() ++ metadata['uploader-serial'] = misc.get_xo_serial() + + if not self._metadata_write_valid(metadata): + return False +@@ -1027,38 +1027,6 @@ class SchoolServerMenu(BaseCopyMenuItem): + # This is sync-operation. Call the post-operation now. + self._post_operate_per_metadata_per_action(metadata) + +- def __get_serial_number(self): +- _OFW_TREE = '/ofw' +- _PROC_TREE = '/proc/device-tree' +- _SN = 'serial-number' +- _not_available = _('Not available') +- +- serial_no = None +- if os.path.exists(os.path.join(_OFW_TREE, _SN)): +- serial_no = self.__read_file(os.path.join(_OFW_TREE, _SN)) +- elif os.path.exists(os.path.join(_PROC_TREE, _SN)): +- serial_no = self.__read_file(os.path.join(_PROC_TREE, _SN)) +- +- if serial_no is None: +- serial_no = _not_available +- +- # Remove the trailing binary character, else DBUS will crash. +- return serial_no.rstrip('\x00') +- +- def __read_file(self, path): +- if os.access(path, os.R_OK) == 0: +- return None +- +- fd = open(path, 'r') +- value = fd.read() +- fd.close() +- if value: +- value = value.strip('\n') +- return value +- else: +- logging.debug('No information in file or directory: %s', path) +- return None +- + + class FriendsMenu(gtk.Menu): + __gtype_name__ = 'JournalFriendsMenu' +-- +1.7.4.4 + |