From: Dan Nicholson <nicholson@endlessm.com>
Date: Thu, 9 Nov 2017 02:15:11 +0000 (+0000)
Subject: bin/summary: Fix --raw option
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~29^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=374f7fc9733370f1814e6c97cb03a240bca08814;p=ostree.git

bin/summary: Fix --raw option

I wanted to inspect a summary file the other day and was saddened to
find it was broken:

  $ ostree summary --raw
  error: No option specified; use -u to update summary

Fix the test to do the normal thing of passing just --raw without
--view. It's legal to pass --raw and --view, but it shouldn't be a
requirement.

Closes: #1336
Approved by: cgwalters
---

diff --git a/src/ostree/ot-builtin-summary.c b/src/ostree/ot-builtin-summary.c
index c6319f15..ba8f379b 100644
--- a/src/ostree/ot-builtin-summary.c
+++ b/src/ostree/ot-builtin-summary.c
@@ -210,7 +210,7 @@ ostree_builtin_summary (int argc, char **argv, OstreeCommandInvocation *invocati
             return FALSE;
         }
     }
-  else if (opt_view)
+  else if (opt_view || opt_raw)
     {
       g_autoptr(GBytes) summary_data = NULL;
 
diff --git a/tests/test-summary-view.sh b/tests/test-summary-view.sh
index 52ac8926..6e421079 100755
--- a/tests/test-summary-view.sh
+++ b/tests/test-summary-view.sh
@@ -55,7 +55,7 @@ assert_file_has_content_literal summary.txt "Timestamp (ostree.commit.timestamp)
 echo "ok view summary"
 
 # Check the summary can be viewed raw too.
-${OSTREE} summary --view --raw > raw-summary.txt
+${OSTREE} summary --raw > raw-summary.txt
 assert_file_has_content_literal raw-summary.txt "('main', ("
 assert_file_has_content_literal raw-summary.txt "('other', ("
 assert_file_has_content_literal raw-summary.txt "{'ostree.summary.last-modified': <uint64"