← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to scripts/install.py

  • Committer: Colin Watson
  • Date: 2010-03-18 18:15:01 UTC
  • Revision ID: cjwatson@canonical.com-20100318181501-vayhurwxhqflfd6j
remove trailing whitespace (and trailing semicolons in Python code); the red highlights and inability to use paragraph motions in vim were annoying me

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/install.py
368
368
            self.configure_apt()
369
369
 
370
370
            self.configure_plugins()
371
 
            
 
371
 
372
372
            self.next_region()
373
373
            self.run_target_config_hooks()
374
374
 
431
431
                self.copy_wallpaper_cache()
432
432
            except:
433
433
                syslog.syslog(syslog.LOG_WARNING,
434
 
                    'Could not copy wallpaper cache:')                
 
434
                    'Could not copy wallpaper cache:')
435
435
                for line in traceback.format_exc().split('\n'):
436
436
                    syslog.syslog(syslog.LOG_WARNING, line)
437
437
            self.copy_dcd()
2044
2044
        except debconf.DebconfError:
2045
2045
            if not inst_langpacks:
2046
2046
                return
2047
 
        
 
2047
 
2048
2048
        if inst_langpacks:
2049
2049
            extra_packages += self.langpacks
2050
 
        
 
2050
 
2051
2051
        save_replace = None
2052
2052
        save_override = None
2053
2053
        custom = '/etc/apt/sources.list.d/oem-config.list'
2409
2409
                stdout=subprocess.PIPE).communicate()[0].strip('\n')
2410
2410
            uid = int(uid)
2411
2411
            gid = int(gid)
2412
 
            self.copy_tree(casper_user_wallpaper_cache_dir, 
 
2412
            self.copy_tree(casper_user_wallpaper_cache_dir,
2413
2413
                           target_user_wallpaper_cache_dir, uid, gid)
2414
2414
            os.chmod(target_user_cache_dir, 0700)
2415
2415
            os.chmod(target_user_wallpaper_cache_dir, 0700)