File bleachbit-bnc712471.patch of Package bleachbit

Overview Repositories Revisions Requests Users Attributes Meta

File bleachbit-bnc712471.patch of Package bleachbit

Index: bleachbit/Cleaner.py
===================================================================
--- bleachbit/Cleaner.py.orig
+++ bleachbit/Cleaner.py
@@ -373,7 +373,7 @@ class System(Cleaner):
             self.add_option('rotated_logs', _('Rotated logs'), _('Delete old system logs'))
             self.add_option('recent_documents', _('Recent documents list'), _('Delete the list of recently used documents'))
             self.add_option('trash', _('Trash'), _('Empty the trash'))
-        if 'linux2' == sys.platform:
+        if sys.platform.startswith('linux'):
             self.add_option('memory', _('Memory'), \
             # TRANSLATORS: 'free' means 'unallocated'
                _('Wipe the swap and free memory'))
@@ -479,7 +479,7 @@ class System(Cleaner):
                     files += [ globbed ]
 
         # memory
-        if 'linux2' == sys.platform and 'memory' == option_id:
+        if sys.platform.startswith('linux') and 'memory' == option_id:
             yield Command.Function(None, Memory.wipe_memory, _('Memory'))
 
         # memory dump
Index: bleachbit/CleanerML.py
===================================================================
--- bleachbit/CleanerML.py.orig
+++ bleachbit/CleanerML.py
@@ -74,7 +74,7 @@ class CleanerML:
         if len(os_str) == 0 or None != self.xlate_cb:
             return True
         # Otherwise, check platform.
-        if os_str == 'linux' and sys.platform == 'linux2':
+        if os_str == 'linux' and sys.platform.startswith('linux'):
             return True
         if os_str == 'windows' and sys.platform == 'win32':
             return True
Index: bleachbit/Common.py
===================================================================
--- bleachbit/Common.py.orig
+++ bleachbit/Common.py
@@ -91,7 +91,7 @@ personal_cleaners_dir = os.path.join(opt
 
 # system cleaners
 system_cleaners_dir = None
-if sys.platform == 'linux2':
+if sys.platform.startswith('linux'):
     system_cleaners_dir = '/usr/share/bleachbit/cleaners'
 elif sys.platform == 'win32':
     system_cleaners_dir = os.path.join(bleachbit_exe_path, 'share\\cleaners\\')
@@ -119,7 +119,7 @@ if os.path.exists("./locale/"):
     print "debug: locale_dir = '%s'" % (locale_dir, )
 else:
     # system-wide installed locale
-    if sys.platform == 'linux2':
+    if sys.platform.startswith('linux'):
         locale_dir = "/usr/share/locale/"
     elif sys.platform == 'win32':
         locale_dir = os.path.join(bleachbit_exe_path, 'share\\locale\\')
Index: bleachbit/Diagnostic.py
===================================================================
--- bleachbit/Diagnostic.py.orig
+++ bleachbit/Diagnostic.py
@@ -59,7 +59,7 @@ def diagnostic_info():
     for env in envs:
         s += "\nos.getenv('%s') = %s" % (env, os.getenv(env))
     s += "\nos.expanduser('~') = %s" % os.path.expanduser('~')
-    if 'linux2' == sys.platform:
+    if sys.platform.startswith('linux'):
         if hasattr(platform, 'linux_distribution'):
             s += "\nplatform.linux_distribution() = %s" % str(platform.linux_distribution())
         else:
Index: bleachbit/General.py
===================================================================
--- bleachbit/General.py.orig
+++ bleachbit/General.py
@@ -152,7 +152,7 @@ def run_external(args, stdout = False, e
 
 def sudo_mode():
     """Return whether running in sudo mode"""
-    if 'linux2' != sys.platform:
+    if not sys.platform.startswith('linux'):
         return False
 
     #if 'root' == os.getenv('USER'):
Index: bleachbit/Memory.py
===================================================================
--- bleachbit/Memory.py.orig
+++ bleachbit/Memory.py
@@ -200,7 +200,7 @@ def physical_free_windows():
 
 
 def physical_free():
-    if 'linux2' == sys.platform:
+    if sys.platform.startswith('linux'):
         return physical_free_linux()
     elif 'win32' == sys.platform:
         return physical_free_windows()
Index: bleachbit/Update.py
===================================================================
--- bleachbit/Update.py.orig
+++ bleachbit/Update.py
@@ -82,7 +82,7 @@ def user_agent():
     if sys.platform == "win32":
         # misleading: Python 2.5.4 shows uname()[2] as Vista on Windows 7
         __os = platform.uname()[3][0:3] # 5.1 = Windows XP, 6.0 = Vista, 6.1 = 7
-    elif sys.platform == 'linux2':
+    elif sys.platform.startswith('linux'):
         dist = platform.dist() 
         # example: ('fedora', '11', 'Leonidas')
         # example: ('', '', '') for Arch Linux

Places

File bleachbit-bnc712471.patch of Package bleachbit

Places