keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

diff: Don't print changelogs by default

Browse Source 
Communicating information is a hard problem, but basically there
are two things here.  First, the changelogs make the diff visual
spaghetti.  (If we were rendering to HTML with expanders or something,
it could work).

Second, I think RPM changelogs are legacy - tooling should pull from
git.

So far when doing release announcements I've been manually stripping
out the changelogs, embarassingly enough.  Time to fix that.

Anyways, we preserve the changelog-emitting code, it's just not the
default now.

Closes: #439
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-08-30 14:26:30 -04:00 committed by Atomic Bot
parent 436a8116f2
commit 525c605092
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/rpmostree-db-builtin-diff.c
View File

@ -25,9 +25,11 @@
#include "rpmostree-rpm-util.h" #include "rpmostree-rpm-util.h"
static char *opt_format; static char *opt_format;
static gboolean opt_changelogs;
static GOptionEntry option_entries[] = { static GOptionEntry option_entries[] = {
{ "format", 'F', 0, G_OPTION_ARG_STRING, &opt_format, "Output format: \"diff\" or (default) \"block\"", "FORMAT" }, { "format", 'F', 0, G_OPTION_ARG_STRING, &opt_format, "Output format: \"diff\" or (default) \"block\"", "FORMAT" },
{ "changelogs", 'c', 0, G_OPTION_ARG_NONE, &opt_changelogs, "Also output RPM changelogs", NULL },
{ NULL } { NULL }
}; };
@ -82,7 +84,8 @@ rpmostree_db_builtin_diff (int argc, char **argv, GCancellable *cancellable, GEr
} }
else if (g_str_equal (opt_format, "block")) else if (g_str_equal (opt_format, "block"))
{ {
rpmhdrs_diff_prnt_block (rpmhdrs_diff (rpmrev_get_headers (rpmrev1), rpmhdrs_diff_prnt_block (opt_changelogs,
rpmhdrs_diff (rpmrev_get_headers (rpmrev1),
rpmrev_get_headers (rpmrev2))); rpmrev_get_headers (rpmrev2)));
} }
else else

5
src/libpriv/rpmostree-rpm-util.c
View File

@ -429,7 +429,7 @@ _rpmhdrs_diff_cmp_end (const GPtrArray *hs1, const GPtrArray *hs2)
} }
void void
rpmhdrs_diff_prnt_block (struct RpmHeadersDiff *diff) rpmhdrs_diff_prnt_block (gboolean changelogs, struct RpmHeadersDiff *diff)
{ {
int num = 0; int num = 0;
@ -477,6 +477,9 @@ rpmhdrs_diff_prnt_block (struct RpmHeadersDiff *diff)
printf (" "); printf (" ");
pkg_print (hn); pkg_print (hn);
if (!changelogs)
continue;
/* Load the old %changelog entries */ /* Load the old %changelog entries */
ochanges_date = &ochanges_date_s; ochanges_date = &ochanges_date_s;
headerGet (ho, RPMTAG_CHANGELOGTIME, ochanges_date, HEADERGET_MINMEM); headerGet (ho, RPMTAG_CHANGELOGTIME, ochanges_date, HEADERGET_MINMEM);

2
src/libpriv/rpmostree-rpm-util.h
View File

@ -60,7 +60,7 @@ rpmhdrs_rpmdbv (struct RpmHeaders *l1,
GError **error); GError **error);
void void
rpmhdrs_diff_prnt_block (struct RpmHeadersDiff *diff); rpmhdrs_diff_prnt_block (gboolean changelogs, struct RpmHeadersDiff *diff);
void void
rpmhdrs_diff_prnt_diff (struct RpmHeadersDiff *diff); rpmhdrs_diff_prnt_diff (struct RpmHeadersDiff *diff);