commit 64723b286354388a01db13b56fab9dda29cf27c1
author Leo Lung <leolung@google.com> Thu Jan 24 14:29:18 2019 -0800
committer Leo Lung <leolung@google.com> Wed Jan 30 23:52:29 2019 +0000
tree 4a6773dfd62e955d31dc8b326acc0dd1817efd5c
parent 2c8c57404c1471ff3451aab87410a09e52cc43ab

[fuchsia-pkg] Fail component launches without URLs

TESTED=GI patched with this CL

CF-156 #done
D O N E
O
N
E

Change-Id: Iaa37ace3c4b217ed2b97521cf20f70956003dacf

bin/appmgr/realm.cc

diff --git a/bin/appmgr/realm.cc b/bin/appmgr/realm.cc
index 2d66598..8f6f62b 100644
--- a/bin/appmgr/realm.cc
+++ b/bin/appmgr/realm.cc
@@ -658,22 +658,17 @@
 
   // TODO(CF-156): Remove this logic once all URLs are fuchsia-pkg.
   if (!is_fuchsia_pkg_url) {
-    std::string pkg_url_error =
-        "Component " + fp.GetDefaultComponentName() +
-        " was launched without using fuchsia-pkg URLs! Use " +
-        package->resolved_url + "#" + fp.GetDefaultComponentCmxPath() +
-        " instead. See https://fuchsia.googlesource.com/docs/+/master/" +
-        "glossary.md#fuchsia_pkg-url for more information.";
-    if (!cmx.deprecated_bare_package_url()) {
-      FXL_LOG(ERROR) << pkg_url_error << " The component was not whitelisted"
-                     << " to launch with bare package URLs, and it cannot be"
-                     << " launched!";
-      component_request.SetReturnValues(kComponentCreationFailed,
-                                        TerminationReason::INTERNAL_ERROR);
-      return;
-    } else {
-      FXL_LOG(WARNING) << pkg_url_error;
-    }
+    FXL_LOG(ERROR)
+        << "Component " << fp.GetDefaultComponentName()
+        << " was launched without using fuchsia-pkg URLs! Use "
+        << package->resolved_url << "#" << fp.GetDefaultComponentCmxPath()
+        << " instead. See https://fuchsia.googlesource.com/docs/+/master/"
+        << "glossary.md#fuchsia_pkg-url for more information. The component "
+        << "was not whitelisted to launch with bare package URLs, and it "
+        << "cannot be launched!";
+    component_request.SetReturnValues(kComponentCreationFailed,
+                                      TerminationReason::INTERNAL_ERROR);
+    return;
   }
 
   RuntimeMetadata runtime;