Merge lp:~brunonova/software-properties/lp1381050_2 into lp:software-properties
Status: | Needs review |
---|---|
Proposed branch: | lp:~brunonova/software-properties/lp1381050_2 |
Merge into: | lp:software-properties |
Diff against target: |
16 lines (+3/-2) 1 file modified
softwareproperties/SoftwareProperties.py (+3/-2) |
To merge this branch: | bzr merge lp:~brunonova/software-properties/lp1381050_2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Murray | Needs Fixing | ||
Michael Vogt | Pending | ||
Review via email: mp+264634@code.launchpad.net |
Description of the change
This should fix LP: #1381050.
This change was already proposed and accepted (https:/
As mentioned in my last comment in the bug report, I think that the software-
This patch forces the path to be handled in UTF-8, fixing the bug (tested).
Michael Vogt reviewed the other merge requests, so he's free to review this one as well. :)
Unmerged revisions
- 939. By Bruno Nova
-
Ensure that True/False is returned in add_key method in SoftwarePropert
ies.py - 938. By Bruno Nova
-
Actually fix LP: #1381050
I've tested the change provided in Wily and it doesn't seem to fix the Traceback for me. Here is a result of trying import the key from the related bug report:
ipdb> n .DBusException: org.freedesktop .DBus.Python. UnicodeEncodeEr ror: Traceback (most recent call last): python3/ dist-packages/ dbus/service. py", line 707, in _message_cb method( self, *args, **keywords) python3/ dist-packages/ softwarepropert ies/dbus/ SoftwarePropert iesDBus. py", line 288, in AddKey python3/ dist-packages/ softwarepropert ies/SoftwarePro perties. py", line 804, in add_key "utf-8" ) python3. 4/genericpath. py", line 19, in exists
dbus.exceptions
File "/usr/lib/
retval = candidate_
File "/usr/lib/
return self.add_key(path)
File "/usr/lib/
path = path.encode(
File "/usr/lib/
os.stat(path)
UnicodeEncodeError: 'ascii' codec can't encode character '\xed' in position 58: ordinal not in range(128)