← Back to branch summary

~gary-lasker/software-center/cherrypick-for-5.2.2.1

« back to all changes in this revision

Viewing changes to softwarecenter/log.py

  • Committer: Michael Vogt
  • Date: 2012-05-15 07:51:29 UTC
  • mfrom: (2989.17.8 software-center)
  • Revision ID: michael.vogt@ubuntu.com-20120515075129-szlkcz1nqcs0qu46
merge lp:~gary-lasker/software-center/fix-makedirs-race-crashes and add small test for test_safe_makedirs

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/log.py
23
23
import os.path
24
24
 
25
25
from paths import SOFTWARE_CENTER_CACHE_DIR
26
 
from utils import ensure_file_writable_and_delete_if_not
 
26
from utils import (
 
27
    ensure_file_writable_and_delete_if_not,
 
28
    safe_makedirs,
 
29
)
27
30
 
28
31
""" setup global logging for software-center """
29
32
 
93
96
handler.addFilter(NullFilterThatWarnsAboutRootLoggerUsage())
94
97
 
95
98
# create log file
96
 
if not os.path.exists(SOFTWARE_CENTER_CACHE_DIR):
97
 
    os.makedirs(SOFTWARE_CENTER_CACHE_DIR)
 
99
safe_makedirs(SOFTWARE_CENTER_CACHE_DIR)
98
100
logfile_path = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "software-center.log")
99
101
 
100
102
# try to fix inaccessible s-c directory (#688682)
108
110
        if not os.path.exists(target):
109
111
            os.rename(SOFTWARE_CENTER_CACHE_DIR, target)
110
112
            break
111
 
    os.makedirs(SOFTWARE_CENTER_CACHE_DIR)
 
113
    safe_makedirs(SOFTWARE_CENTER_CACHE_DIR)
112
114
 
113
115
# according to bug 688682 many people have a non-writeable logfile
114
116
ensure_file_writable_and_delete_if_not(logfile_path)