← Back to branch summary

~jamesodhunt/ubuntu/saucy/upstart/1.9.1

« back to all changes in this revision

Viewing changes to init/xdg.c

  • Committer: James Hunt
  • Date: 2013-06-28 15:57:37 UTC
  • mfrom: (1436.2.1)
  • Revision ID: james.hunt@ubuntu.com-20130628155737-8bskclzrhmjvpm6e
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/xdg.c
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