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

Read treefile directly for documentation flag

Browse Source 
Part of removing treespec in favor of treefile.
This commit is contained in:
Colin Walters 2021-04-11 13:58:42 -04:00
parent 6321916436
commit 69a79bc8e6
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rust/src/lib.rs
View File

@ -255,6 +255,7 @@ pub mod ffi {
fn get_rojig_name(&self) -> String;
fn get_cliwrap(&self) -> bool;
fn get_readonly_executables(&self) -> bool;
fn get_documentation(&self) -> bool;
fn get_rpmdb(&self) -> String;
fn get_files_remove_regex(&self, package: &str) -> Vec<String>;
fn print_deprecation_warnings(&self);

4
rust/src/treefile.rs
View File

@ -557,6 +557,10 @@ impl Treefile {
self.parsed.readonly_executables.unwrap_or(false)
}
pub(crate) fn get_documentation(&self) -> bool {
self.parsed.documentation.unwrap_or(true)
}
pub(crate) fn get_rpmdb(&self) -> String {
let s: &str = match self.parsed.rpmdb.as_ref().unwrap_or(&DEFAULT_RPMDB_BACKEND) {
RpmdbBackend::BDB => "bdb",

2
src/app/rpmostree-composeutil.cxx
View File

@ -213,8 +213,6 @@ rpmostree_composeutil_get_treespec (RpmOstreeContext *ctx,
!json_object_has_member (treedata, "lockfile-repos"))
return (RpmOstreeTreespec*)glnx_null_throw (error, "Treefile has neither \"repos\" nor \"lockfile-repos\" members");
if (!treespec_bind_bool (treedata, treespec, "documentation", TRUE, error))
return NULL;
if (!treespec_bind_bool (treedata, treespec, "recommends", TRUE, error))
return NULL;
if (!treespec_bind_array (treedata, treespec, "install-langs", "instlangs", FALSE, error))

27
src/libpriv/rpmostree-core.cxx
View File

@ -279,7 +279,6 @@ rpmostree_treespec_new_from_keyfile (GKeyFile *keyfile,
if (g_key_file_get_boolean (keyfile, "tree", "skip-sanity-check", NULL))
g_variant_builder_add (&builder, "{sv}", "skip-sanity-check", g_variant_new_boolean (TRUE));
tf_bind_boolean (keyfile, &builder, "documentation", TRUE);
tf_bind_boolean (keyfile, &builder, "recommends", TRUE);
tf_bind_boolean (keyfile, &builder, "selinux", TRUE);
@ -824,14 +823,11 @@ rpmostree_context_setup (RpmOstreeContext *self,
for (guint i = 0; i < repos->len; i++)
dnf_repo_set_required (static_cast<DnfRepo*>(repos->pdata[i]), TRUE);
{ gboolean docs;
g_assert (g_variant_dict_lookup (self->spec->dict, "documentation", "b", &docs));
if (!docs)
dnf_transaction_set_flags (dnf_context_get_transaction (self->dnfctx),
DNF_TRANSACTION_FLAG_NODOCS);
}
if (self->treefile_rs && !self->treefile_rs->get_documentation())
{
dnf_transaction_set_flags (dnf_context_get_transaction (self->dnfctx),
DNF_TRANSACTION_FLAG_NODOCS);
}
/* We could likely delete this, but I'm keeping a log message just in case */
if (g_variant_dict_contains (self->spec->dict, "ignore-scripts"))
@ -1413,9 +1409,7 @@ find_pkg_in_ostree (RpmOstreeContext *self,
/* We need to handle things like the nodocs flag changing; in that case we
* have to redownload.
*/
gboolean global_docs;
g_variant_dict_lookup (self->spec->dict, "documentation", "b", &global_docs);
const gboolean global_nodocs = !global_docs;
const bool global_nodocs = (self->treefile_rs && !self->treefile_rs->get_documentation());
gboolean pkgcache_commit_is_nodocs;
if (!g_variant_dict_lookup (metadata_dict, "rpmostree.nodocs", "b", &pkgcache_commit_is_nodocs))
@ -1424,7 +1418,7 @@ find_pkg_in_ostree (RpmOstreeContext *self,
/* We treat a mismatch of documentation state as simply not being
* imported at all.
*/
if (global_nodocs != pkgcache_commit_is_nodocs)
if (global_nodocs != (bool)pkgcache_commit_is_nodocs)
return TRUE;
}
@ -2629,11 +2623,8 @@ start_async_import_one_package (RpmOstreeContext *self, DnfPackage *pkg,
g_str_equal (pkg_name, "rootfiles"))
flags |= RPMOSTREE_IMPORTER_FLAGS_SKIP_EXTRANEOUS;
{ gboolean docs;
g_assert (g_variant_dict_lookup (self->spec->dict, "documentation", "b", &docs));
if (!docs)
flags |= RPMOSTREE_IMPORTER_FLAGS_NODOCS;
}
if (self->treefile_rs && !self->treefile_rs->get_documentation())
flags |= RPMOSTREE_IMPORTER_FLAGS_NODOCS;
if (self->treefile_rs && self->treefile_rs->get_readonly_executables())
flags |= RPMOSTREE_IMPORTER_FLAGS_RO_EXECUTABLES;