1 files changed, 23 insertions, 21 deletions

diff --git a/bpkg/pkg-disfigure.cxx b/bpkg/pkg-disfigure.cxx
index 9347bbc..1c356f0 100644
--- a/bpkg/pkg-disfigure.cxx
+++ b/bpkg/pkg-disfigure.cxx
@@ -15,8 +15,8 @@ using namespace butl;
 namespace bpkg
 {
   void
-  pkg_disfigure (const dir_path& c,
-                 const common_options& o,
+  pkg_disfigure (const common_options& o,
+                 database& db,
                  transaction& t,
                  const shared_ptr<selected_package>& p,
                  bool clean,
@@ -29,28 +29,30 @@ namespace bpkg
 
     l4 ([&]{trace << *p;});
 
-    database& db (t.database ());
     tracer_guard tg (db, trace);
 
     // Check that we have no dependents.
     //
     if (p->state == package_state::configured)
     {
-      using query = query<package_dependent>;
-
-      auto r (db.query<package_dependent> (query::name == p->name));
-
-      if (!r.empty ())
+      diag_record dr;
+      for (database& ddb: db.dependent_configs ())
       {
-        diag_record dr;
-        dr << fail << "package " << p->name << " still has dependents:";
+        auto r (query_dependents (ddb, p->name, db));
 
-        for (const package_dependent& pd: r)
+        if (!r.empty ())
         {
-          dr << info << "package " << pd.name;
+          if (dr.empty ())
+            dr << fail << "package " << p->name << db << " still has "
+                       << "dependents:";
 
-          if (pd.constraint)
-            dr << " on " << p->name << " " << *pd.constraint;
+          for (const package_dependent& pd: r)
+          {
+            dr << info << "package " << pd.name << ddb;
+
+            if (pd.constraint)
+              dr << " on " << p->name << " " << *pd.constraint;
+          }
         }
       }
     }
@@ -75,8 +77,8 @@ namespace bpkg
 
     if (!simulate)
     {
-      dir_path src_root (p->effective_src_root (c));
-      dir_path out_root (p->effective_out_root (c));
+      dir_path src_root (p->effective_src_root (db.config_orig));
+      dir_path out_root (p->effective_out_root (db.config_orig));
 
       l4 ([&]{trace << "src_root: " << src_root << ", "
                     << "out_root: " << out_root;});
@@ -105,8 +107,8 @@ namespace bpkg
         if (src_root == out_root)
           bspec = "disfigure('" + rep + "')";
         else
-          bspec = "disfigure('" + src_root.representation () + "'@'" +
-            rep + "')";
+          bspec = "disfigure('" + src_root.representation () + "'@'" + rep +
+                  "')";
       }
 
       l4 ([&]{trace << "buildspec: " << bspec;});
@@ -179,7 +181,7 @@ namespace bpkg
         db.update (p);
         t.commit ();
 
-        info << "package " << p->name << " is now broken; "
+        info << "package " << p->name << db << " is now broken; "
              << "use 'pkg-purge' to remove";
         throw;
       }
@@ -207,7 +209,7 @@ namespace bpkg
     package_name n (parse_package_name (args.next (),
                                         false /* allow_version */));
 
-    database db (open (c, trace));
+    database db (c, trace, true /* pre_attach */);
     transaction t (db);
 
     shared_ptr<selected_package> p (db.find<selected_package> (n));
@@ -221,7 +223,7 @@ namespace bpkg
 
     // Commits the transaction.
     //
-    pkg_disfigure (c, o, t, p, !o.keep_out (), false /* simulate */);
+    pkg_disfigure (o, db, t, p, !o.keep_out (), false /* simulate */);
 
     assert (p->state == package_state::unpacked ||
             p->state == package_state::transient);