From 72baefb8e34102c7f54737bf36fcb10798cfda6b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 17 Sep 2015 14:22:13 +0200 Subject: Consistently use 'c' as configuration directory variable --- bpkg/pkg-fetch.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bpkg/pkg-fetch.cxx') 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 p = db.find (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. // -- cgit v1.1