diff options
| author | Steven M. Parrish <smparrish@gmail.com> | 2010-11-19 14:22:46 (GMT) |
|---|---|---|
| committer | Steven M. Parrish <smparrish@gmail.com> | 2010-11-19 14:22:46 (GMT) |
| commit | ef66ec7c96c7fe260948f9167dbc1ff06c2eaf3b (patch) | |
| tree | e6346e1094c9c2c317eb443a1fddfd5e31f8a5ef | |
| parent | 64218d52c06ecc52e0c1d7ffa1d4cc77bb197e46 (diff) | |
Fix for SL2060 Bogus names
| -rw-r--r-- | rpms/sugar/sl2060-Copying-multiple-times-bogus-names.patch | 24 | ||||
| -rw-r--r-- | rpms/sugar/sugar.spec | 4 |
2 files changed, 27 insertions, 1 deletions
diff --git a/rpms/sugar/sl2060-Copying-multiple-times-bogus-names.patch b/rpms/sugar/sl2060-Copying-multiple-times-bogus-names.patch new file mode 100644 index 0000000..84980bc --- /dev/null +++ b/rpms/sugar/sl2060-Copying-multiple-times-bogus-names.patch @@ -0,0 +1,24 @@ +diff -crB sugar-0.88.1/src/jarabe/journal/model.py sugar-0.88.1.40/src/jarabe/journal/model.py +*** sugar-0.88.1/src/jarabe/journal/model.py 2010-11-18 15:32:45.283141506 -0500 +--- sugar-0.88.1.40/src/jarabe/journal/model.py 2010-11-18 15:41:54.672158818 -0500 +*************** +*** 522,530 **** + + def _get_unique_file_name(mount_point, file_name): + if os.path.exists(os.path.join(mount_point, file_name)): + i = 1 + while len(file_name) <= 255: +- name, extension = os.path.splitext(file_name) + file_name = name + '_' + str(i) + extension + if not os.path.exists(os.path.join(mount_point, file_name)): + break +--- 522,530 ---- + + def _get_unique_file_name(mount_point, file_name): + if os.path.exists(os.path.join(mount_point, file_name)): ++ name, extension = os.path.splitext(file_name) + i = 1 + while len(file_name) <= 255: + file_name = name + '_' + str(i) + extension + if not os.path.exists(os.path.join(mount_point, file_name)): + break diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index cb79e32..3de9a92 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -3,7 +3,7 @@ Summary: Constructionist learning platform Name: sugar Version: 0.88.1 -Release: 5.39dxo%{?dist} +Release: 5.40dxo%{?dist} URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 @@ -35,6 +35,7 @@ Patch21: sl1673-fix-network-disconnect-and-discard-history-v2.patch Patch23: sl1940-register-session-failed-fix.patch Patch24: sl328-disable-start-menu-options-for-unk-items.patch Patch25: sl1725-homewindow-resize-on-resolution-change.patch +Patch26: sl2060-Copying-multiple-times-bogus-names.patch # Andres' journal filesize enhancement Patch101: sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch @@ -181,6 +182,7 @@ multiple instances of sugar. %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 %patch101 -p1 %patch102 -p1 |