diff options
Diffstat (limited to 'bpkg/package-skeleton.cxx')
| -rw-r--r-- | bpkg/package-skeleton.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx index 385a4fd..ba74853 100644 --- a/bpkg/package-skeleton.cxx +++ b/bpkg/package-skeleton.cxx @@ -101,14 +101,14 @@ namespace bpkg database& db, const available_package& ap, strings cvs, - /*const vector<config_variable>* css,*/ // @@ TMP + const vector<config_variable>* css, optional<dir_path> src_root, optional<dir_path> out_root) : co_ (&co), db_ (&db), available_ (&ap), config_vars_ (move (cvs)), - config_srcs_ (/*css*/ nullptr) // @@ TMP + config_srcs_ (css) { // Should not be created for stubs. // @@ -599,7 +599,9 @@ namespace bpkg if (!reflect_vars_.empty ()) { - assert (config_srcs_ == nullptr); // Should have been merged. + // @@ TMP Uncomment when the merge is implemented. + // + //assert (config_srcs_ == nullptr); // Should have been merged. vars = move (reflect_vars_); |