blob: 1d897a7fa9fe112388d20f704d40b393865ccb4e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From af343445e645180e2b53ca3ef2ed7a9a1f0f6969 Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajay@activitycentral.com>
Date: Wed, 19 Sep 2012 18:29:51 +0530
Subject: [PATCH] sdxo#2337: Remove the trailing '\x00' character from
serial-number; else when it is used as a metadata in
copying to SS, DBUS will crash.
Organization: Sugar Labs Foundation
Signed-off-by: Ajay Garg <ajay@activitycentral.com>
---
src/jarabe/journal/palettes.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index facfd0d..72a06b1 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -1041,7 +1041,9 @@ class SchoolServerMenu(BaseCopyMenuItem):
if serial_no is None:
serial_no = _not_available
- return serial_no
+
+ # 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:
--
1.7.4.4
|
