diff options
| author | Ajay Garg <ajay@activitycentral.com> | 2012-09-19 13:03:28 (GMT) |
|---|---|---|
| committer | Ajay Garg <ajay@activitycentral.com> | 2012-09-19 13:03:28 (GMT) |
| commit | 9f3b3b82f306dd33284c18b7bacdd1e547845f51 (patch) | |
| tree | 457c89b450cf68de07835076333ae7e86bf7efd8 | |
| parent | 6ffc1d19a147a3b785cc90bfbc01557cb7f8206c (diff) | |
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.
| -rw-r--r-- | rpms/sugar/0143-sdxo-2337-Remove-the-trailing-x00-character-from-ser.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/rpms/sugar/0143-sdxo-2337-Remove-the-trailing-x00-character-from-ser.patch b/rpms/sugar/0143-sdxo-2337-Remove-the-trailing-x00-character-from-ser.patch new file mode 100644 index 0000000..1d897a7 --- /dev/null +++ b/rpms/sugar/0143-sdxo-2337-Remove-the-trailing-x00-character-from-ser.patch @@ -0,0 +1,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 + |