~vorlon/ubuntu/raring/upstart/lp.1199778

« back to all changes in this revision

Viewing changes to init/xdg.c

  • Committer: Steve Langasek
  • Date: 2013-11-07 03:06:51 UTC
  • Revision ID: steve.langasek@canonical.com-20131107030651-f1jzeyi7ifvvw1h8
Attempt to cherry-pick fixes for bug #1199778 to raring; something is still
missing though, the test suite segfaults on one of the json loads.

Show diffs side-by-side

added added

removed removed

Lines of Context:
319
319
        dirs = NULL;
320
320
 
321
321
        /* System's read-only location */
322
 
        if (! nih_str_array_add (&all_dirs, NULL, NULL, SYSTEM_USERCONFDIR))
323
 
                goto error;
 
322
        if (! getenv ("UPSTART_NO_SYSTEM_USERCONFDIR")) {
 
323
                if (! nih_str_array_add (&all_dirs, NULL, NULL, SYSTEM_USERCONFDIR))
 
324
                        goto error;
 
325
        }
324
326
 
325
327
        return all_dirs;
326
328