Changeset 4451 for syncer/trunk

Timestamp:

Apr 26, 2017, 12:33:52 PM (4 years ago)

Author:

mabarracus

Message:

Fix processing errors with wrong filenames

Location:

syncer/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• syncer.install/usr/lib/syncer/plugins/plank.py (modified) (3 diffs)

syncer/trunk/fuentes/debian/changelog

@@ +1 @@
+syncer (1.3) xenial; urgency=medium
+
+  * Fix processing errors with wrong filenames
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 26 Apr 2017 12:32:44 +0200
+
 syncer (1.2) xenial; urgency=medium
 

syncer/trunk/fuentes/syncer.install/usr/lib/syncer/plugins/plank.py

@@ -41 +41 @@
                         else:
                             filelist.append(os.path.join(root,file))
-            return filelist
+            if filelist == []:
+                return None
+            else:
+                return filelist
 
         except:
@@ -70 +73 @@
                     where='skel'
                     file_name = self.search_item(where, params['option'])
-                    if file_name == None:
+                    if not file_name:
                         return True,'Not found '+params['option']
+
                 # check if already added
                 if self.search_item('plank',params['option']):
                     return True,'Already added'
+
                 # create element
                 if where == 'applications':
@@ -84 +89 @@
                 with open(os.path.expanduser('~')+'/.config/plank/dock1/launchers/'+params['option']+'.dockitem','w') as f:
                     f.writelines(entry)
+
                 return True,'Added {}'.format(file_name)
             except Exception as e:
-                return False,str(e)
+                return True,'Not added, error is: {}'.format(str(e))
         elif params['action'] == 'remove':
             try: