rpms/rpm-ostree
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert the ostree:// formatting in the output.

Browse Source 
See https://github.com/projectatomic/rpm-ostree/pull/1136#issuecomment-358122137

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
This commit is contained in:
Dusty Mabe 2018-01-19 21:07:42 -05:00
parent bf924bb6f5
commit 866d7e07f7
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Revert-status-Prefix-ostree-refspecs-with-ostree.patch Normal file
View File

@ -0,0 +1,39 @@
From 677c80b7f9eb145d863f2735fb0e9ec96c3f2c49 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Fri, 19 Jan 2018 21:01:31 -0500
Subject: [PATCH] Revert "status: Prefix ostree refspecs with ostree://"
This reverts commit d99175f664983a9ae6f73a95568639fcd3568b34.
---
src/app/rpmostree-builtin-status.c | 2 +-
tests/check/test-basic.sh | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/app/rpmostree-builtin-status.c b/src/app/rpmostree-builtin-status.c
index 282ef17..bbaa697 100644
--- a/src/app/rpmostree-builtin-status.c
+++ b/src/app/rpmostree-builtin-status.c
@@ -305,7 +305,7 @@ status_generic (RPMOSTreeSysroot *sysroot_proxy,
g_print ("%s ", is_booted ? libsd_special_glyph (BLACK_CIRCLE) : " ");
if (origin_refspec)
- g_print ("ostree://%s", origin_refspec);
+ g_print ("%s", origin_refspec);
else
g_print ("%s", checksum);
g_print ("\n");
diff --git a/tests/check/test-basic.sh b/tests/check/test-basic.sh
index d36441e..645c258 100755
--- a/tests/check/test-basic.sh
+++ b/tests/check/test-basic.sh
@@ -50,7 +50,6 @@ assert_status_jq '.deployments[0].version == "1.0.10"'
echo "ok status shows right version"
rpm-ostree status > status.txt
-assert_file_has_content status.txt ' ostree://testos:testos/buildmaster/x86_64-runtime'
assert_file_has_content status.txt 'Version: 1.0.10'
assert_not_file_has_content status.txt StateRoot:
rpm-ostree status -v > status.txt
--
2.14.3

8
rpm-ostree.spec
View File

@ -1,13 +1,15 @@
Summary: Hybrid image/package system
Name: rpm-ostree
Version: 2018.1
Release: 1%{?dist}
Release: 2%{?dist}
#VCS: https://github.com/cgwalters/rpm-ostree
# This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
Source0: rpm-ostree-%{version}.tar.xz
License: LGPLv2+
URL: https://github.com/projectatomic/rpm-ostree
Patch0: 0001-Revert-status-Prefix-ostree-refspecs-with-ostree.patch
# We always run autogen.sh
BuildRequires: autoconf automake libtool git
# For docs
@ -151,6 +153,10 @@ python autofiles.py > files.devel \
%files devel -f files.devel
%changelog
* Fri Jan 19 2018 Dusty Mabe <dusty@dustymabe.com> - 2018.1-2
- Revert the ostree:// formatting in the output.
- See https://github.com/projectatomic/rpm-ostree/pull/1136#issuecomment-358122137
* Mon Jan 15 2018 Colin Walters <walters@verbum.org> - 2018.1-1
- https://github.com/projectatomic/rpm-ostree/releases/tag/v2018.1