Merge pull request #991 from tjkirch/updata-fail-missing-manifest

updata add-update: don't create manifest, require 'init' first
bottlerocket-os · Jul 14, 2020 · 94b5329 · 94b5329
2 parents a29a145 + e3ad928
commit 94b5329
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/sources/updater/update_metadata/src/error.rs b/sources/updater/update_metadata/src/error.rs
@@ -71,7 +71,7 @@ pub enum Error {
         backtrace: Backtrace,
     },
 
-    #[snafu(display("Failed to read manifest file {}: {}", path.display(), source))]
+    #[snafu(display("Failed to read manifest file '{}' - do you need to `updata init`? ({})", path.display(), source))]
     ManifestRead {
         path: PathBuf,
         source: std::io::Error,

diff --git a/sources/updater/updog/src/bin/updata.rs b/sources/updater/updog/src/bin/updata.rs
@@ -59,11 +59,7 @@ struct AddUpdateArgs {
 
 impl AddUpdateArgs {
     fn run(self) -> Result<()> {
-        let mut manifest: Manifest = match update_metadata::load_file(&self.file) {
-            Ok(m) => m,
-            _ => Manifest::default(), // TODO only if EEXIST
-        };
-
+        let mut manifest: Manifest = update_metadata::load_file(&self.file)?;
         manifest.add_update(
             self.image_version,
             self.max_version,