← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lvm2/quantal

« back to all changes in this revision

Viewing changes to lib/commands/toolcontext.c

  • Committer: Steve Langasek
  • Date: 2012-04-14 02:57:53 UTC
  • mfrom: (3.1.22 sid)
  • Revision ID: steve.langasek@canonical.com-20120414025753-ejbdw9c8llik58y9
https://launchpad.net/bugs/726677
Merge version 2.02.88-2 from Debian testing

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/commands/toolcontext.c
782
782
 
783
783
        if (cache_dir || cache_file_prefix) {
784
784
                if (dm_snprintf(cache_file, sizeof(cache_file),
785
 
                    "%s%s%s/%s.cache",
786
 
                    cache_dir ? "" : cmd->system_dir,
787
 
                    cache_dir ? "" : "/",
788
 
                    cache_dir ? : DEFAULT_CACHE_SUBDIR,
 
785
                    "%s/%s.cache",
 
786
                    cache_dir ? : DEFAULT_RUN_DIR,
789
787
                    cache_file_prefix ? : DEFAULT_CACHE_FILE_PREFIX) < 0) {
790
788
                        log_error("Persistent cache filename too long.");
791
789
                        f3->destroy(f3);
793
791
                }
794
792
        } else if (!(dev_cache = find_config_tree_str(cmd, "devices/cache", NULL)) &&
795
793
                   (dm_snprintf(cache_file, sizeof(cache_file),
796
 
                                "%s/%s/%s.cache",
797
 
                                cmd->system_dir, DEFAULT_CACHE_SUBDIR,
 
794
                                "%s/%s.cache",
 
795
                                DEFAULT_RUN_DIR,
798
796
                                DEFAULT_CACHE_FILE_PREFIX) < 0)) {
799
797
                log_error("Persistent cache filename too long.");
800
798
                f3->destroy(f3);