diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-09-17 14:22:13 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-09-17 14:22:13 +0200 |
| commit | 72baefb8e34102c7f54737bf36fcb10798cfda6b (patch) | |
| tree | 36b11576324e8073de67e43d0a042acb38c6a507 /bpkg/pkg-fetch.cxx | |
| parent | 7221a63204a0b2a89e1c72fcbf9f2a7de0a575a3 (diff) | |
Consistently use 'c' as configuration directory variable
Diffstat (limited to 'bpkg/pkg-fetch.cxx')
| -rw-r--r-- | bpkg/pkg-fetch.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bpkg/pkg-fetch.cxx b/bpkg/pkg-fetch.cxx index 063f0d5..c7982e8 100644 --- a/bpkg/pkg-fetch.cxx +++ b/bpkg/pkg-fetch.cxx @@ -27,10 +27,10 @@ namespace bpkg { tracer trace ("pkg_fetch"); - dir_path d (o.directory ()); - level4 ([&]{trace << "configuration: " << d;}); + dir_path c (o.directory ()); + level4 ([&]{trace << "configuration: " << c;}); - database db (open (d)); + database db (open (c)); path a; bool purge; @@ -88,18 +88,18 @@ namespace bpkg // See if this package already exists in this configuration. // if (shared_ptr<package> p = db.find<package> (n)) - fail << "package " << n << " already exists in configuration " << d << + fail << "package " << n << " already exists in configuration " << c << info << "version: " << p->version << ", state: " << p->state; // Make the archive and configuration paths absolute and normalized. // If the archive is inside the configuration, use the relative path. // This way we can move the configuration around. // - d.complete ().normalize (); + c.complete ().normalize (); a.complete ().normalize (); - if (a.sub (d)) - a = a.leaf (d); + if (a.sub (c)) + a = a.leaf (c); // Add the package to the configuration. // |