← Back to branch summary

~nataliabidart/software-center/winged-migration

« back to all changes in this revision

Viewing changes to softwarecenter/log.py

  • Committer: Natalia B. Bidart
  • Date: 2012-05-30 18:39:55 UTC
  • mto: This revision was merged to the branch mainline in revision 3030.
  • Revision ID: natalia.bidart@canonical.com-20120530183955-zbnjczayktmmg5tv
- Initial test cleanup:
  - Renamed test/ dir to tests/.
  - Isolated test code into tests/ directory, including moving all the
    get_test_window_foo from the gtk3 production modules to
    tests/gtk3/windows.py module.
  - Removed all the calls to Gtk.main() in gtk3 tests since that blocks the
    execution of the suite.
  - Pep8 and pyflakes fixes in the files already modified in this branch.
  - Minor bug fix in the softwarecenter/log.py module when trying to create a
    log dir with proper perms.

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/log.py
22
22
import logging.handlers
23
23
import os.path
24
24
 
25
 
from paths import SOFTWARE_CENTER_CACHE_DIR
26
 
from utils import (
 
25
import softwarecenter.paths
 
26
from softwarecenter.utils import (
27
27
    ensure_file_writable_and_delete_if_not,
28
28
    safe_makedirs,
29
29
)
96
96
handler.addFilter(NullFilterThatWarnsAboutRootLoggerUsage())
97
97
 
98
98
# create log file
99
 
safe_makedirs(SOFTWARE_CENTER_CACHE_DIR)
100
 
logfile_path = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "software-center.log")
 
99
safe_makedirs(softwarecenter.paths.SOFTWARE_CENTER_CACHE_DIR)
101
100
 
102
101
# try to fix inaccessible s-c directory (#688682)
103
 
if not os.access(SOFTWARE_CENTER_CACHE_DIR, os.W_OK):
 
102
if not os.access(softwarecenter.paths.SOFTWARE_CENTER_CACHE_DIR, os.W_OK):
104
103
    logging.warn("found not writable '%s' dir, trying to fix" %
105
 
                 SOFTWARE_CENTER_CACHE_DIR)
 
104
                 softwarecenter.paths.SOFTWARE_CENTER_CACHE_DIR)
106
105
    # if we have to do more renames, soemthing else is wrong and its
107
106
    # ok to crash later to learn about the problem
108
107
    for i in range(10):
109
 
        target = "%s.%s" % (SOFTWARE_CENTER_CACHE_DIR, i)
 
108
        target = "%s.%s" % (softwarecenter.paths.SOFTWARE_CENTER_CACHE_DIR, i)
110
109
        if not os.path.exists(target):
111
 
            os.rename(SOFTWARE_CENTER_CACHE_DIR, target)
 
110
            softwarecenter.paths.SOFTWARE_CENTER_CACHE_DIR = target
112
111
            break
113
 
    safe_makedirs(SOFTWARE_CENTER_CACHE_DIR)
114
 
 
 
112
    safe_makedirs(softwarecenter.paths.SOFTWARE_CENTER_CACHE_DIR)
 
113
 
 
114
 
 
115
logfile_path = os.path.join(softwarecenter.paths.SOFTWARE_CENTER_CACHE_DIR,
 
116
                            "software-center.log")
115
117
# according to bug 688682 many people have a non-writeable logfile
116
118
ensure_file_writable_and_delete_if_not(logfile_path)
117
119