Fix test failures with new verification note in libdcp. scaling-rework
authorCarl Hetherington <cth@carlh.net>
Tue, 12 May 2020 14:54:54 +0000 (16:54 +0200)
committerCarl Hetherington <cth@carlh.net>
Tue, 12 May 2020 14:54:54 +0000 (16:54 +0200)
src/lib/dcp.cc

index c62b339fa2207260c4c9ac81509aa264825d6169..477b61e9f4849dc0a1c620a7f3f35eb7f423d994 100644 (file)
@@ -75,9 +75,9 @@ DCP::cpls () const
                list<dcp::VerificationNote> notes;
                dcp->read (&notes, true);
                if (!_tolerant) {
-                       /** We accept and ignore EmptyAssetPathError but everything else is bad */
+                       /** We accept and ignore EMPTY_ASSET_PATH and EXTERNAL_ASSET but everything else is bad */
                        BOOST_FOREACH (dcp::VerificationNote j, notes) {
-                               if (j.code() == dcp::VerificationNote::EMPTY_ASSET_PATH) {
+                               if (j.code() == dcp::VerificationNote::EMPTY_ASSET_PATH || j.code() == dcp::VerificationNote::EXTERNAL_ASSET) {
                                        LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
                                } else {
                                        boost::throw_exception(dcp::ReadError(dcp::note_to_string(j)));