From e4cab7f7294af4551fe87388f0e38b3595232f42 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 8 Nov 2022 01:55:34 -0500 Subject: [PATCH] import libdnf-0.63.0-11.1.el8 --- ...te-all-repository-config-options-RhB.patch | 107 ++ ...variable-in-unittest-instead-of-ugly.patch | 50 + ...for-filling-reading-and-verifying-ne.patch | 169 +++ ...rdata-to-check-versions-and-checksum.patch | 417 ++++++ ...to-test-the-new-private-dnf-solvfile.patch | 83 ++ ...d-libsolv-version-for-cache-versioni.patch | 38 + ...c-error-handling-for-loading-repomd-.patch | 46 + ...on-RPMItem-Fix-handling-transaction-.patch | 74 + ...on-TransactionItem-Set-short-action-.patch | 33 + ...ors-on-failovermethod-repo-option-Rh.patch | 45 + ...sack-query.hpp-Add-a-missing-include.patch | 24 + ...ext_remove-accepts-package-spec-as-d.patch | 128 ++ ...dnf_context_install-remove-update-di.patch | 62 + ...filter-out-advPkgs-with-different-a.patch} | 2 +- ...o-filtering-for-advisory-candidates.patch} | 4 +- ...> 0041-Update-translations-RHEL-8.7.patch} | 1292 +++++++++++------ SPECS/libdnf.spec | 40 +- 17 files changed, 2171 insertions(+), 443 deletions(-) create mode 100644 SOURCES/0026-context-Substitute-all-repository-config-options-RhB.patch create mode 100644 SOURCES/0027-Use-environment-variable-in-unittest-instead-of-ugly.patch create mode 100644 SOURCES/0028-Add-private-API-for-filling-reading-and-verifying-ne.patch create mode 100644 SOURCES/0029-Use-dnf-solv-userdata-to-check-versions-and-checksum.patch create mode 100644 SOURCES/0030-Update-unittest-to-test-the-new-private-dnf-solvfile.patch create mode 100644 SOURCES/0031-Increase-required-libsolv-version-for-cache-versioni.patch create mode 100644 SOURCES/0032-Add-more-specific-error-handling-for-loading-repomd-.patch create mode 100644 SOURCES/0033-libdnf-transaction-RPMItem-Fix-handling-transaction-.patch create mode 100644 SOURCES/0034-libdnf-transaction-TransactionItem-Set-short-action-.patch create mode 100644 SOURCES/0035-Do-not-print-errors-on-failovermethod-repo-option-Rh.patch create mode 100644 SOURCES/0036-sack-query.hpp-Add-a-missing-include.patch create mode 100644 SOURCES/0037-context-dnf_context_remove-accepts-package-spec-as-d.patch create mode 100644 SOURCES/0038-context-Fix-doc-dnf_context_install-remove-update-di.patch rename SOURCES/{0027-advisory-upgrade-filter-out-advPkgs-with-different-a.patch => 0039-advisory-upgrade-filter-out-advPkgs-with-different-a.patch} (98%) rename SOURCES/{0028-Add-obsoletes-to-filtering-for-advisory-candidates.patch => 0040-Add-obsoletes-to-filtering-for-advisory-candidates.patch} (98%) rename SOURCES/{0026-Update-translations-RhBug-2017272.patch => 0041-Update-translations-RHEL-8.7.patch} (83%) diff --git a/SOURCES/0026-context-Substitute-all-repository-config-options-RhB.patch b/SOURCES/0026-context-Substitute-all-repository-config-options-RhB.patch new file mode 100644 index 0000000..340d2c5 --- /dev/null +++ b/SOURCES/0026-context-Substitute-all-repository-config-options-RhB.patch @@ -0,0 +1,107 @@ +From 7d8f9cfcdf7725fef2c99ecb2dedcdff1e9506d7 Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Wed, 13 Apr 2022 12:26:10 +0200 +Subject: [PATCH 26/34] context: Substitute all repository config options + (RhBug:2076853) + +It also solves the problem: Substitution of variables in `baseurl` +does not work in microdnf and PackageKit unless `metalink` or `mirrorlist` +is set at the same time. +--- + libdnf/dnf-repo.cpp | 34 +++++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 9 deletions(-) + +diff --git a/libdnf/dnf-repo.cpp b/libdnf/dnf-repo.cpp +index 710045fb..9d42e3e3 100644 +--- a/libdnf/dnf-repo.cpp ++++ b/libdnf/dnf-repo.cpp +@@ -83,6 +83,7 @@ typedef struct + LrHandle *repo_handle; + LrResult *repo_result; + LrUrlVars *urlvars; ++ bool unit_test_mode; /* ugly hack for unit tests */ + } DnfRepoPrivate; + + G_DEFINE_TYPE_WITH_PRIVATE(DnfRepo, dnf_repo, G_TYPE_OBJECT) +@@ -847,8 +848,11 @@ dnf_repo_conf_reset(libdnf::ConfigRepo &config) + + /* Loads repository configuration from GKeyFile */ + static void +-dnf_repo_conf_from_gkeyfile(libdnf::ConfigRepo &config, const char *repoId, GKeyFile *gkeyFile) ++dnf_repo_conf_from_gkeyfile(DnfRepo *repo, const char *repoId, GKeyFile *gkeyFile) + { ++ DnfRepoPrivate *priv = GET_PRIVATE(repo); ++ auto & config = *priv->repo->getConfig(); ++ + // Reset to the initial state before reloading the configuration. + dnf_repo_conf_reset(config); + +@@ -883,20 +887,31 @@ dnf_repo_conf_from_gkeyfile(libdnf::ConfigRepo &config, const char *repoId, GKey + // list can be ['value1', 'value2, value3'] therefore we first join + // to have 'value1, value2, value3' + g_autofree gchar * tmp_strval = g_strjoinv(",", list); ++ ++ // Substitute vars. ++ g_autofree gchar *subst_value = dnf_repo_substitute(repo, tmp_strval); ++ ++ if (strcmp(key, "baseurl") == 0 && strstr(tmp_strval, "file://$testdatadir") != NULL) { ++ priv->unit_test_mode = true; ++ } ++ + try { +- optionItem.newString(libdnf::Option::Priority::REPOCONFIG, tmp_strval); ++ optionItem.newString(libdnf::Option::Priority::REPOCONFIG, subst_value); + } catch (const std::exception & ex) { +- g_debug("Invalid configuration value: %s = %s in %s; %s", key, value.c_str(), repoId, ex.what()); ++ g_debug("Invalid configuration value: %s = %s in %s; %s", key, subst_value, repoId, ex.what()); + } + } + + } else { +- + // process other (non list) options ++ ++ // Substitute vars. ++ g_autofree gchar *subst_value = dnf_repo_substitute(repo, value.c_str()); ++ + try { +- optionItem.newString(libdnf::Option::Priority::REPOCONFIG, value); ++ optionItem.newString(libdnf::Option::Priority::REPOCONFIG, subst_value); + } catch (const std::exception & ex) { +- g_debug("Invalid configuration value: %s = %s in %s; %s", key, value.c_str(), repoId, ex.what()); ++ g_debug("Invalid configuration value: %s = %s in %s; %s", key, subst_value, repoId, ex.what()); + } + + } +@@ -950,7 +965,7 @@ dnf_repo_set_keyfile_data(DnfRepo *repo, gboolean reloadFromGKeyFile, GError **e + + // Reload repository configuration from keyfile. + if (reloadFromGKeyFile) { +- dnf_repo_conf_from_gkeyfile(*conf, repoId, priv->keyfile); ++ dnf_repo_conf_from_gkeyfile(repo, repoId, priv->keyfile); + dnf_repo_apply_setopts(*conf, repoId); + } + +@@ -996,8 +1011,9 @@ dnf_repo_set_keyfile_data(DnfRepo *repo, gboolean reloadFromGKeyFile, GError **e + g_autofree gchar *url = NULL; + url = lr_prepend_url_protocol(baseurls[0]); + if (url != NULL && strncasecmp(url, "file://", 7) == 0) { +- if (g_strstr_len(url, -1, "$testdatadir") == NULL) ++ if (!priv->unit_test_mode) { + priv->kind = DNF_REPO_KIND_LOCAL; ++ } + g_free(priv->location); + g_free(priv->keyring); + priv->location = dnf_repo_substitute(repo, url + 7); +@@ -1224,7 +1240,7 @@ dnf_repo_setup(DnfRepo *repo, GError **error) try + auto repoId = priv->repo->getId().c_str(); + + auto conf = priv->repo->getConfig(); +- dnf_repo_conf_from_gkeyfile(*conf, repoId, priv->keyfile); ++ dnf_repo_conf_from_gkeyfile(repo, repoId, priv->keyfile); + dnf_repo_apply_setopts(*conf, repoId); + + auto sslverify = conf->sslverify().getValue(); +-- +2.31.1 + diff --git a/SOURCES/0027-Use-environment-variable-in-unittest-instead-of-ugly.patch b/SOURCES/0027-Use-environment-variable-in-unittest-instead-of-ugly.patch new file mode 100644 index 0000000..31fb712 --- /dev/null +++ b/SOURCES/0027-Use-environment-variable-in-unittest-instead-of-ugly.patch @@ -0,0 +1,50 @@ +From 074ca4cf643c79b8ec3db89a7fd5580ba387eb4d Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Wed, 20 Apr 2022 08:22:30 +0200 +Subject: [PATCH 27/34] Use environment variable in unittest instead of ugly + hack in libdnf + +Libdnf contains hacks for unit tests. This removes one hack. +--- + libdnf/dnf-repo.cpp | 3 --- + tests/libdnf/dnf-self-test.c | 3 +++ + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libdnf/dnf-repo.cpp b/libdnf/dnf-repo.cpp +index 9d42e3e3..c015d7fd 100644 +--- a/libdnf/dnf-repo.cpp ++++ b/libdnf/dnf-repo.cpp +@@ -1191,7 +1191,6 @@ dnf_repo_setup(DnfRepo *repo, GError **error) try + DnfRepoEnabled enabled = DNF_REPO_ENABLED_NONE; + g_autofree gchar *basearch = NULL; + g_autofree gchar *release = NULL; +- g_autofree gchar *testdatadir = NULL; + + basearch = g_key_file_get_string(priv->keyfile, "general", "arch", NULL); + if (basearch == NULL) +@@ -1230,8 +1229,6 @@ dnf_repo_setup(DnfRepo *repo, GError **error) try + for (const auto & item : libdnf::dnf_context_get_vars(priv->context)) + priv->urlvars = lr_urlvars_set(priv->urlvars, item.first.c_str(), item.second.c_str()); + +- testdatadir = dnf_realpath(TESTDATADIR); +- priv->urlvars = lr_urlvars_set(priv->urlvars, "testdatadir", testdatadir); + if (!lr_handle_setopt(priv->repo_handle, error, LRO_VARSUB, priv->urlvars)) + return FALSE; + if (!lr_handle_setopt(priv->repo_handle, error, LRO_GNUPGHOMEDIR, priv->keyring)) +diff --git a/tests/libdnf/dnf-self-test.c b/tests/libdnf/dnf-self-test.c +index 52958371..906f0e21 100644 +--- a/tests/libdnf/dnf-self-test.c ++++ b/tests/libdnf/dnf-self-test.c +@@ -1225,6 +1225,9 @@ main(int argc, char **argv) + g_log_set_fatal_mask(NULL, G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL); + g_log_set_always_fatal (G_LOG_FATAL_MASK); + ++ /* Sets a variable to replace in repository configurations. */ ++ g_setenv("DNF_VAR_testdatadir", TESTDATADIR, TRUE); ++ + /* tests go here */ + g_test_add_func("/libdnf/repo_loader{gpg-asc}", dnf_repo_loader_gpg_asc_func); + g_test_add_func("/libdnf/repo_loader{gpg-wrong-asc}", dnf_repo_loader_gpg_wrong_asc_func); +-- +2.31.1 + diff --git a/SOURCES/0028-Add-private-API-for-filling-reading-and-verifying-ne.patch b/SOURCES/0028-Add-private-API-for-filling-reading-and-verifying-ne.patch new file mode 100644 index 0000000..dfbfcbd --- /dev/null +++ b/SOURCES/0028-Add-private-API-for-filling-reading-and-verifying-ne.patch @@ -0,0 +1,169 @@ +From 983aeea57d75494fd4ea2ff2903f966136278c15 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Wed, 9 Feb 2022 13:17:00 +0100 +Subject: [PATCH 28/34] Add private API for filling, reading and verifying new + dnf solv userdata + +--- + libdnf/hy-iutil-private.hpp | 24 +++++++++ + libdnf/hy-iutil.cpp | 102 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 126 insertions(+) + +diff --git a/libdnf/hy-iutil-private.hpp b/libdnf/hy-iutil-private.hpp +index e07b1b51..d498c032 100644 +--- a/libdnf/hy-iutil-private.hpp ++++ b/libdnf/hy-iutil-private.hpp +@@ -24,6 +24,30 @@ + #include "hy-iutil.h" + #include "hy-types.h" + #include "sack/packageset.hpp" ++#include ++#include ++ ++// Use 8 bytes for libsolv version (API: solv_toolversion) ++// to be future proof even though it currently is "1.2" ++static constexpr const size_t solv_userdata_solv_toolversion_size{8}; ++static constexpr const std::array solv_userdata_magic{'\0', 'd', 'n', 'f'}; ++static constexpr const std::array solv_userdata_dnf_version{'\0', '1', '.', '0'}; ++ ++static constexpr const int solv_userdata_size = solv_userdata_solv_toolversion_size + \ ++ solv_userdata_magic.size() + \ ++ solv_userdata_dnf_version.size() + \ ++ CHKSUM_BYTES; ++ ++struct SolvUserdata { ++ char dnf_magic[solv_userdata_magic.size()]; ++ char dnf_version[solv_userdata_dnf_version.size()]; ++ char libsolv_version[solv_userdata_solv_toolversion_size]; ++ unsigned char checksum[CHKSUM_BYTES]; ++}__attribute__((packed)); ; ++ ++int solv_userdata_fill(SolvUserdata *solv_userdata, const unsigned char *checksum, GError** error); ++std::unique_ptr solv_userdata_read(FILE *fp); ++int solv_userdata_verify(const SolvUserdata *solv_userdata, const unsigned char *checksum); + + /* crypto utils */ + int checksum_cmp(const unsigned char *cs1, const unsigned char *cs2); +diff --git a/libdnf/hy-iutil.cpp b/libdnf/hy-iutil.cpp +index 2af13197..f81ca52f 100644 +--- a/libdnf/hy-iutil.cpp ++++ b/libdnf/hy-iutil.cpp +@@ -43,6 +43,7 @@ extern "C" { + #include + #include + #include ++#include + #include + #include + } +@@ -182,6 +183,107 @@ int checksum_write(const unsigned char *cs, FILE *fp) + return 0; + } + ++static std::array ++get_padded_solv_toolversion() ++{ ++ std::array padded_solv_toolversion{}; ++ std::string solv_ver_str{solv_toolversion}; ++ std::copy(solv_ver_str.rbegin(), solv_ver_str.rend(), padded_solv_toolversion.rbegin()); ++ ++ return padded_solv_toolversion; ++} ++ ++int ++solv_userdata_fill(SolvUserdata *solv_userdata, const unsigned char *checksum, GError** error) ++{ ++ if (strlen(solv_toolversion) > solv_userdata_solv_toolversion_size) { ++ g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR, ++ _("Libsolv's solv_toolversion is: %zu long but we expect max of: %zu"), ++ strlen(solv_toolversion), solv_userdata_solv_toolversion_size); ++ return 1; ++ } ++ ++ // copy dnf solv file magic ++ memcpy(solv_userdata->dnf_magic, solv_userdata_magic.data(), solv_userdata_magic.size()); ++ ++ // copy dnf solv file version ++ memcpy(solv_userdata->dnf_version, solv_userdata_dnf_version.data(), solv_userdata_dnf_version.size()); ++ ++ // copy libsolv solv file version ++ memcpy(solv_userdata->libsolv_version, get_padded_solv_toolversion().data(), solv_userdata_solv_toolversion_size); ++ ++ // copy checksum ++ memcpy(solv_userdata->checksum, checksum, CHKSUM_BYTES); ++ ++ return 0; ++} ++ ++ ++std::unique_ptr ++solv_userdata_read(FILE *fp) ++{ ++ unsigned char *dnf_solvfile_userdata_read = NULL; ++ int dnf_solvfile_userdata_len_read; ++ if (!fp) { ++ return nullptr; ++ } ++ ++ int ret_code = solv_read_userdata(fp, &dnf_solvfile_userdata_read, &dnf_solvfile_userdata_len_read); ++ // The userdata layout has to match our struct exactly so we can just cast the memory ++ // allocated by libsolv ++ std::unique_ptr uniq_userdata(reinterpret_cast(dnf_solvfile_userdata_read)); ++ if(ret_code) { ++ g_warning("Failed to read solv userdata: solv_read_userdata returned: %i", ret_code); ++ return nullptr; ++ } ++ ++ if (dnf_solvfile_userdata_len_read != solv_userdata_size) { ++ g_warning("Solv userdata length mismatch, read: %i vs expected: %i", ++ dnf_solvfile_userdata_len_read, solv_userdata_size); ++ return nullptr; ++ } ++ ++ return uniq_userdata; ++} ++ ++gboolean ++solv_userdata_verify(const SolvUserdata *solv_userdata, const unsigned char *checksum) ++{ ++ // check dnf solvfile magic bytes ++ if (memcmp(solv_userdata->dnf_magic, solv_userdata_magic.data(), solv_userdata_magic.size()) != 0) { ++ // This is not dnf header do not read after it ++ g_warning("magic bytes don't match, read: %s vs. dnf solvfile magic: %s", ++ solv_userdata->dnf_magic, solv_userdata_magic.data()); ++ return FALSE; ++ } ++ ++ // check dnf solvfile version ++ if (memcmp(solv_userdata->dnf_version, solv_userdata_dnf_version.data(), solv_userdata_dnf_version.size()) != 0) { ++ // Mismatching dnf solvfile version -> we need to regenerate ++ g_warning("dnf solvfile version doesn't match, read: %s vs. dnf solvfile version: %s", ++ solv_userdata->dnf_version, solv_userdata_dnf_version.data()); ++ return FALSE; ++ } ++ ++ // check libsolv solvfile version ++ if (memcmp(solv_userdata->libsolv_version, get_padded_solv_toolversion().data(), solv_userdata_solv_toolversion_size) != 0) { ++ // Mismatching libsolv solvfile version -> we need to regenerate ++ g_warning("libsolv solvfile version doesn't match, read: %s vs. libsolv version: %s", ++ solv_userdata->libsolv_version, solv_toolversion); ++ return FALSE; ++ } ++ ++ // check solvfile checksum ++ if (checksum_cmp(solv_userdata->checksum, checksum)) { ++ // Mismatching solvfile checksum -> we need to regenerate ++ g_debug("solvfile checksum doesn't match, read: %s vs. repomd checksum: %s", ++ solv_userdata->checksum, checksum); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + int + checksum_type2length(int type) + { +-- +2.31.1 + diff --git a/SOURCES/0029-Use-dnf-solv-userdata-to-check-versions-and-checksum.patch b/SOURCES/0029-Use-dnf-solv-userdata-to-check-versions-and-checksum.patch new file mode 100644 index 0000000..fd7feff --- /dev/null +++ b/SOURCES/0029-Use-dnf-solv-userdata-to-check-versions-and-checksum.patch @@ -0,0 +1,417 @@ +From 465a6a59279bd7fa2680c626ca0f10c059276668 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Wed, 9 Feb 2022 13:18:41 +0100 +Subject: [PATCH 29/34] Use dnf solv userdata to check versions and checksum + (RhBug:2027445) + +Remove unused functions for checksums + += changelog = +msg: Write and check versions and checksums for solvfile cache by using new dnf solvfile userdata (RhBug:2027445) + It is not possible to use old cache files, therefore cache regeneration is triggered automatically. +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2027445 +--- + libdnf/dnf-sack.cpp | 254 ++++++++++++++++++++++-------------- + libdnf/hy-iutil-private.hpp | 2 - + libdnf/hy-iutil.cpp | 20 --- + 3 files changed, 156 insertions(+), 120 deletions(-) + +diff --git a/libdnf/dnf-sack.cpp b/libdnf/dnf-sack.cpp +index b9baeaef..61f4807c 100644 +--- a/libdnf/dnf-sack.cpp ++++ b/libdnf/dnf-sack.cpp +@@ -225,17 +225,39 @@ dnf_sack_new(void) + return DNF_SACK(g_object_new(DNF_TYPE_SACK, NULL)); + } + +-static int +-can_use_repomd_cache(FILE *fp_solv, unsigned char cs_repomd[CHKSUM_BYTES]) +-{ +- unsigned char cs_cache[CHKSUM_BYTES]; +- +- if (fp_solv && +- !checksum_read(cs_cache, fp_solv) && +- !checksum_cmp(cs_cache, cs_repomd)) +- return 1; ++// Try to load cached solv file into repo otherwise return FALSE ++static gboolean ++try_to_use_cached_solvfile(const char *path, Repo *repo, int flags, const unsigned char *checksum, GError **err){ ++ FILE *fp_cache = fopen(path, "r"); ++ if (!fp_cache) { ++ // Missing cache files (ENOENT) are not an error and can even be expected in some cases ++ // (such as when repo doesn't have updateinfo/prestodelta metadata). ++ // Use g_debug in order not to pollute the log by default with such entries. ++ if (errno == ENOENT) { ++ g_debug("Failed to open solvfile cache: %s: %s", path, strerror(errno)); ++ } else { ++ g_warning("Failed to open solvfile cache: %s: %s", path, strerror(errno)); ++ } ++ return FALSE; ++ } ++ std::unique_ptr solv_userdata = solv_userdata_read(fp_cache); ++ gboolean ret = TRUE; ++ if (solv_userdata && solv_userdata_verify(solv_userdata.get(), checksum)) { ++ // after reading the header rewind to the begining ++ fseek(fp_cache, 0, SEEK_SET); ++ if (repo_add_solv(repo, fp_cache, flags)) { ++ g_set_error (err, ++ DNF_ERROR, ++ DNF_ERROR_INTERNAL_ERROR, ++ _("repo_add_solv() has failed.")); ++ ret = FALSE; ++ } ++ } else { ++ ret = FALSE; ++ } + +- return 0; ++ fclose(fp_cache); ++ return ret; + } + + void +@@ -375,33 +397,27 @@ load_ext(DnfSack *sack, HyRepo hrepo, _hy_repo_repodata which_repodata, + gboolean done = FALSE; + + char *fn_cache = dnf_sack_give_cache_fn(sack, name, suffix); +- fp = fopen(fn_cache, "r"); + assert(libdnf::repoGetImpl(hrepo)->checksum); +- if (can_use_repomd_cache(fp, libdnf::repoGetImpl(hrepo)->checksum)) { +- int flags = 0; +- /* the updateinfo is not a real extension */ +- if (which_repodata != _HY_REPODATA_UPDATEINFO) +- flags |= REPO_EXTEND_SOLVABLES; +- /* do not pollute the main pool with directory component ids */ +- if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER) +- flags |= REPO_LOCALPOOL; +- done = TRUE; ++ ++ int flags = 0; ++ /* the updateinfo is not a real extension */ ++ if (which_repodata != _HY_REPODATA_UPDATEINFO) ++ flags |= REPO_EXTEND_SOLVABLES; ++ /* do not pollute the main pool with directory component ids */ ++ if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER) ++ flags |= REPO_LOCALPOOL; ++ if (try_to_use_cached_solvfile(fn_cache, repo, flags, libdnf::repoGetImpl(hrepo)->checksum, error)) { + g_debug("%s: using cache file: %s", __func__, fn_cache); +- ret = repo_add_solv(repo, fp, flags); +- if (ret) { +- g_set_error_literal (error, +- DNF_ERROR, +- DNF_ERROR_INTERNAL_ERROR, +- _("failed to add solv")); +- return FALSE; +- } else { +- repo_update_state(hrepo, which_repodata, _HY_LOADED_CACHE); +- repo_set_repodata(hrepo, which_repodata, repo->nrepodata - 1); +- } ++ done = TRUE; ++ repo_update_state(hrepo, which_repodata, _HY_LOADED_CACHE); ++ repo_set_repodata(hrepo, which_repodata, repo->nrepodata - 1); + } ++ if (error && *error) { ++ g_prefix_error(error, _("Loading extension cache %s (%d) failed: "), fn_cache, which_repodata); ++ return FALSE; ++ } ++ + g_free(fn_cache); +- if (fp) +- fclose(fp); + if (done) + return TRUE; + +@@ -514,35 +530,53 @@ write_main(DnfSack *sack, HyRepo hrepo, int switchtosolv, GError **error) + strerror(errno)); + goto done; + } +- rc = repo_write(repo, fp); +- rc |= checksum_write(repoImpl->checksum, fp); +- rc |= fclose(fp); ++ ++ SolvUserdata solv_userdata; ++ if (solv_userdata_fill(&solv_userdata, repoImpl->checksum, error)) { ++ ret = FALSE; ++ fclose(fp); ++ goto done; ++ } ++ ++ Repowriter *writer = repowriter_create(repo); ++ repowriter_set_userdata(writer, &solv_userdata, solv_userdata_size); ++ rc = repowriter_write(writer, fp); ++ repowriter_free(writer); + if (rc) { ++ ret = FALSE; ++ fclose(fp); ++ g_set_error(error, ++ DNF_ERROR, ++ DNF_ERROR_INTERNAL_ERROR, ++ _("While writing primary cache %s repowriter write failed: %i, error: %s"), ++ tmp_fn_templ, rc, pool_errstr(repo->pool)); ++ goto done; ++ } ++ ++ if (fclose(fp)) { + ret = FALSE; + g_set_error (error, + DNF_ERROR, + DNF_ERROR_FILE_INVALID, +- _("write_main() failed writing data: %i"), rc); ++ _("Failed closing tmp file %s: %s"), ++ tmp_fn_templ, strerror(errno)); + goto done; + } + } + if (switchtosolv && repo_is_one_piece(repo)) { ++ repo_empty(repo, 1); + /* switch over to written solv file activate paging */ +- FILE *fp = fopen(tmp_fn_templ, "r"); +- if (fp) { +- repo_empty(repo, 1); +- rc = repo_add_solv(repo, fp, 0); +- fclose(fp); +- if (rc) { +- /* this is pretty fatal */ +- ret = FALSE; +- g_set_error_literal (error, +- DNF_ERROR, +- DNF_ERROR_FILE_INVALID, +- _("write_main() failed to re-load " +- "written solv file")); +- goto done; +- } ++ gboolean loaded = try_to_use_cached_solvfile(tmp_fn_templ, repo, 0, repoImpl->checksum, error); ++ if (error && *error) { ++ g_prefix_error(error, _("Failed to use newly written primary cache: %s: "), tmp_fn_templ); ++ ret = FALSE; ++ goto done; ++ } ++ if (!loaded) { ++ g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR, ++ _("Failed to use newly written primary cache: %s"), tmp_fn_templ); ++ ret = FALSE; ++ goto done; + } + } + +@@ -569,20 +603,6 @@ write_ext_updateinfo_filter(Repo *repo, Repokey *key, void *kfdata) + return repo_write_stdkeyfilter(repo, key, 0); + } + +-static int +-write_ext_updateinfo(HyRepo hrepo, Repodata *data, FILE *fp) +-{ +- auto repoImpl = libdnf::repoGetImpl(hrepo); +- Repo *repo = repoImpl->libsolvRepo; +- int oldstart = repo->start; +- repo->start = repoImpl->main_end; +- repo->nsolvables -= repoImpl->main_nsolvables; +- int res = repo_write_filtered(repo, fp, write_ext_updateinfo_filter, data, 0); +- repo->start = oldstart; +- repo->nsolvables += repoImpl->main_nsolvables; +- return res; +-} +- + static gboolean + write_ext(DnfSack *sack, HyRepo hrepo, _hy_repo_repodata which_repodata, + const char *suffix, GError **error) +@@ -611,37 +631,78 @@ write_ext(DnfSack *sack, HyRepo hrepo, _hy_repo_repodata which_repodata, + FILE *fp = fdopen(tmp_fd, "w+"); + + g_debug("%s: storing %s to: %s", __func__, repo->name, tmp_fn_templ); +- if (which_repodata != _HY_REPODATA_UPDATEINFO) +- ret |= repodata_write(data, fp); +- else +- ret |= write_ext_updateinfo(hrepo, data, fp); +- ret |= checksum_write(repoImpl->checksum, fp); +- ret |= fclose(fp); ++ ++ SolvUserdata solv_userdata; ++ if (solv_userdata_fill(&solv_userdata, repoImpl->checksum, error)) { ++ fclose(fp); ++ success = FALSE; ++ goto done; ++ } ++ ++ Repowriter *writer = repowriter_create(repo); ++ repowriter_set_userdata(writer, &solv_userdata, solv_userdata_size); ++ if (which_repodata != _HY_REPODATA_UPDATEINFO) { ++ repowriter_set_repodatarange(writer, data->repodataid, data->repodataid + 1); ++ repowriter_set_flags(writer, REPOWRITER_NO_STORAGE_SOLVABLE); ++ ret = repowriter_write(writer, fp); ++ } else { ++ // write only updateinfo repodata ++ int oldstart = repo->start; ++ repo->start = repoImpl->main_end; ++ repo->nsolvables -= repoImpl->main_nsolvables; ++ repowriter_set_flags(writer, REPOWRITER_LEGACY); ++ repowriter_set_keyfilter(writer, write_ext_updateinfo_filter, data); ++ repowriter_set_keyqueue(writer, 0); ++ ret = repowriter_write(writer, fp); ++ repo->start = oldstart; ++ repo->nsolvables += repoImpl->main_nsolvables; ++ } ++ repowriter_free(writer); + if (ret) { ++ success = FALSE; ++ fclose(fp); ++ g_set_error (error, ++ DNF_ERROR, ++ DNF_ERROR_INTERNAL_ERROR, ++ _("While writing extension cache %s (%d): repowriter write failed: %i, error: %s"), ++ tmp_fn_templ, which_repodata, ret, pool_errstr(repo->pool)); ++ goto done; ++ } ++ ++ if (fclose(fp)) { + success = FALSE; + g_set_error (error, + DNF_ERROR, +- DNF_ERROR_FAILED, +- _("write_ext(%1$d) has failed: %2$d"), +- which_repodata, ret); ++ DNF_ERROR_FILE_INVALID, ++ _("While writing extension cache (%d): cannot close temporary file: %s"), ++ which_repodata, tmp_fn_templ); + goto done; + } + } + + if (repo_is_one_piece(repo) && which_repodata != _HY_REPODATA_UPDATEINFO) { + /* switch over to written solv file activate paging */ +- FILE *fp = fopen(tmp_fn_templ, "r"); +- if (fp) { +- int flags = REPO_USE_LOADING | REPO_EXTEND_SOLVABLES; +- /* do not pollute the main pool with directory component ids */ +- if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER) +- flags |= REPO_LOCALPOOL; +- repodata_extend_block(data, repo->start, repo->end - repo->start); +- data->state = REPODATA_LOADING; +- repo_add_solv(repo, fp, flags); +- data->state = REPODATA_AVAILABLE; +- fclose(fp); ++ int flags = REPO_USE_LOADING | REPO_EXTEND_SOLVABLES; ++ /* do not pollute the main pool with directory component ids */ ++ if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER) ++ flags |= REPO_LOCALPOOL; ++ repodata_extend_block(data, repo->start, repo->end - repo->start); ++ data->state = REPODATA_LOADING; ++ int loaded = try_to_use_cached_solvfile(tmp_fn_templ, repo, flags, repoImpl->checksum, error); ++ if (error && *error) { ++ g_prefix_error(error, _("Failed to use newly written extension cache: %s (%d): "), ++ tmp_fn_templ, which_repodata); ++ success = FALSE; ++ goto done; ++ } ++ if (!loaded) { ++ g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR, ++ _("Failed to use newly written extension cache: %s (%d)"), tmp_fn_templ, which_repodata); ++ success = FALSE; ++ goto done; + } ++ ++ data->state = REPODATA_AVAILABLE; + } + + if (!mv(tmp_fn_templ, fn, error)) { +@@ -672,7 +733,7 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error) + + FILE *fp_primary = NULL; + FILE *fp_repomd = NULL; +- FILE *fp_cache = fopen(fn_cache, "r"); ++ + if (!fn_repomd) { + g_set_error (error, + DNF_ERROR, +@@ -693,18 +754,17 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error) + } + checksum_fp(repoImpl->checksum, fp_repomd); + +- if (can_use_repomd_cache(fp_cache, repoImpl->checksum)) { ++ if (try_to_use_cached_solvfile(fn_cache, repo, 0, repoImpl->checksum, error)) { + const char *chksum = pool_checksum_str(pool, repoImpl->checksum); + g_debug("using cached %s (0x%s)", name, chksum); +- if (repo_add_solv(repo, fp_cache, 0)) { +- g_set_error (error, +- DNF_ERROR, +- DNF_ERROR_INTERNAL_ERROR, +- _("repo_add_solv() has failed.")); +- retval = FALSE; +- goto out; +- } + repoImpl->state_main = _HY_LOADED_CACHE; ++ goto out; ++ } ++ ++ if (error && *error) { ++ g_prefix_error(error, _("While loading repository failed to use %s: "), fn_cache); ++ retval = FALSE; ++ goto out; + } else { + auto primary = hrepo->getMetadataPath(MD_TYPE_PRIMARY); + if (primary.empty()) { +@@ -733,8 +793,6 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error) + repoImpl->state_main = _HY_LOADED_FETCH; + } + out: +- if (fp_cache) +- fclose(fp_cache); + if (fp_repomd) + fclose(fp_repomd); + if (fp_primary) +diff --git a/libdnf/hy-iutil-private.hpp b/libdnf/hy-iutil-private.hpp +index d498c032..efc91c63 100644 +--- a/libdnf/hy-iutil-private.hpp ++++ b/libdnf/hy-iutil-private.hpp +@@ -52,9 +52,7 @@ int solv_userdata_verify(const SolvUserdata *solv_userdata, const unsigned char + /* crypto utils */ + int checksum_cmp(const unsigned char *cs1, const unsigned char *cs2); + int checksum_fp(unsigned char *out, FILE *fp); +-int checksum_read(unsigned char *csout, FILE *fp); + int checksum_stat(unsigned char *out, FILE *fp); +-int checksum_write(const unsigned char *cs, FILE *fp); + int checksumt_l2h(int type); + const char *pool_checksum_str(Pool *pool, const unsigned char *chksum); + +diff --git a/libdnf/hy-iutil.cpp b/libdnf/hy-iutil.cpp +index f81ca52f..c409a10a 100644 +--- a/libdnf/hy-iutil.cpp ++++ b/libdnf/hy-iutil.cpp +@@ -142,17 +142,6 @@ checksum_fp(unsigned char *out, FILE *fp) + return 0; + } + +-/* calls rewind(fp) before returning */ +-int +-checksum_read(unsigned char *csout, FILE *fp) +-{ +- if (fseek(fp, -32, SEEK_END) || +- fread(csout, CHKSUM_BYTES, 1, fp) != 1) +- return 1; +- rewind(fp); +- return 0; +-} +- + /* does not move the fp position */ + int + checksum_stat(unsigned char *out, FILE *fp) +@@ -174,15 +163,6 @@ checksum_stat(unsigned char *out, FILE *fp) + return 0; + } + +-/* moves fp to the end of file */ +-int checksum_write(const unsigned char *cs, FILE *fp) +-{ +- if (fseek(fp, 0, SEEK_END) || +- fwrite(cs, CHKSUM_BYTES, 1, fp) != 1) +- return 1; +- return 0; +-} +- + static std::array + get_padded_solv_toolversion() + { +-- +2.31.1 + diff --git a/SOURCES/0030-Update-unittest-to-test-the-new-private-dnf-solvfile.patch b/SOURCES/0030-Update-unittest-to-test-the-new-private-dnf-solvfile.patch new file mode 100644 index 0000000..56c96c5 --- /dev/null +++ b/SOURCES/0030-Update-unittest-to-test-the-new-private-dnf-solvfile.patch @@ -0,0 +1,83 @@ +From 1e0f8f66f6ff30e177c41be7d72330d5eccf2ff8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Wed, 9 Feb 2022 13:24:06 +0100 +Subject: [PATCH 30/34] Update unittest to test the new private dnf solvfile + API + +--- + tests/hawkey/test_iutil.cpp | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +diff --git a/tests/hawkey/test_iutil.cpp b/tests/hawkey/test_iutil.cpp +index 8d00cc94..f3c04782 100644 +--- a/tests/hawkey/test_iutil.cpp ++++ b/tests/hawkey/test_iutil.cpp +@@ -24,6 +24,8 @@ + + + #include ++#include ++#include + + + #include "libdnf/hy-util.h" +@@ -97,28 +99,36 @@ START_TEST(test_checksum) + } + END_TEST + +-START_TEST(test_checksum_write_read) ++START_TEST(test_dnf_solvfile_userdata) + { + char *new_file = solv_dupjoin(test_globals.tmpdir, +- "/test_checksum_write_read", NULL); ++ "/test_dnf_solvfile_userdata", NULL); + build_test_file(new_file); + + unsigned char cs_computed[CHKSUM_BYTES]; +- unsigned char cs_read[CHKSUM_BYTES]; +- FILE *fp = fopen(new_file, "r"); ++ FILE *fp = fopen(new_file, "r+"); + checksum_fp(cs_computed, fp); +- // fails, file opened read-only: +- fail_unless(checksum_write(cs_computed, fp) == 1); +- fclose(fp); +- fp = fopen(new_file, "r+"); +- fail_if(checksum_write(cs_computed, fp)); ++ ++ SolvUserdata solv_userdata; ++ fail_if(solv_userdata_fill(&solv_userdata, cs_computed, NULL)); ++ ++ Pool *pool = pool_create(); ++ Repo *repo = repo_create(pool, "test_repo"); ++ Repowriter *writer = repowriter_create(repo); ++ repowriter_set_userdata(writer, &solv_userdata, solv_userdata_size); ++ fail_if(repowriter_write(writer, fp)); ++ repowriter_free(writer); + fclose(fp); ++ + fp = fopen(new_file, "r"); +- fail_if(checksum_read(cs_read, fp)); +- fail_if(checksum_cmp(cs_computed, cs_read)); ++ std::unique_ptr dnf_solvfile = solv_userdata_read(fp); ++ fail_unless(dnf_solvfile); ++ fail_unless(solv_userdata_verify(dnf_solvfile.get(), cs_computed)); + fclose(fp); + + g_free(new_file); ++ repo_free(repo, 0); ++ pool_free(pool); + } + END_TEST + +@@ -181,7 +191,7 @@ iutil_suite(void) + TCase *tc = tcase_create("Main"); + tcase_add_test(tc, test_abspath); + tcase_add_test(tc, test_checksum); +- tcase_add_test(tc, test_checksum_write_read); ++ tcase_add_test(tc, test_dnf_solvfile_userdata); + tcase_add_test(tc, test_mkcachedir); + tcase_add_test(tc, test_version_split); + suite_add_tcase(s, tc); +-- +2.31.1 + diff --git a/SOURCES/0031-Increase-required-libsolv-version-for-cache-versioni.patch b/SOURCES/0031-Increase-required-libsolv-version-for-cache-versioni.patch new file mode 100644 index 0000000..37b9497 --- /dev/null +++ b/SOURCES/0031-Increase-required-libsolv-version-for-cache-versioni.patch @@ -0,0 +1,38 @@ +From 893eb087e56588d62e81e91e5d283003bd80552a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Tue, 8 Mar 2022 11:43:38 +0100 +Subject: [PATCH 31/34] Increase required libsolv version for cache versioning + +--- + CMakeLists.txt | 2 +- + libdnf.spec | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60cf1b8c..d895b2bf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ endif() + + # build dependencies + find_package(Gpgme REQUIRED) +-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext) ++find_package(LibSolv 0.7.20 REQUIRED COMPONENTS ext) + find_package(OpenSSL REQUIRED) + + +diff --git a/libdnf.spec b/libdnf.spec +index a849cdea..aa51dd28 100644 +--- a/libdnf.spec ++++ b/libdnf.spec +@@ -1,5 +1,5 @@ +-%global libsolv_version 0.7.17 +-%global libmodulemd_version 2.11.2-2 ++%global libsolv_version 0.7.21 ++%global libmodulemd_version 2.13.0 + %global librepo_version 1.13.1 + %global dnf_conflict 4.3.0 + %global swig_version 3.0.12 +-- +2.31.1 + diff --git a/SOURCES/0032-Add-more-specific-error-handling-for-loading-repomd-.patch b/SOURCES/0032-Add-more-specific-error-handling-for-loading-repomd-.patch new file mode 100644 index 0000000..1f0303c --- /dev/null +++ b/SOURCES/0032-Add-more-specific-error-handling-for-loading-repomd-.patch @@ -0,0 +1,46 @@ +From b636af779fcdab326eef7bbb74912254c2fa2b0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Thu, 17 Mar 2022 10:34:24 +0100 +Subject: [PATCH 32/34] Add more specific error handling for loading repomd and + primary + +--- + libdnf/dnf-sack.cpp | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +diff --git a/libdnf/dnf-sack.cpp b/libdnf/dnf-sack.cpp +index 61f4807c..8e11b8f8 100644 +--- a/libdnf/dnf-sack.cpp ++++ b/libdnf/dnf-sack.cpp +@@ -780,13 +780,24 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error) + fp_primary = solv_xfopen(primary.c_str(), "r"); + assert(fp_primary); + +- g_debug("fetching %s", name); +- if (repo_add_repomdxml(repo, fp_repomd, 0) || \ +- repo_add_rpmmd(repo, fp_primary, 0, 0)) { ++ g_debug("Loading repomd: %s", fn_repomd); ++ if (repo_add_repomdxml(repo, fp_repomd, 0)) { + g_set_error (error, + DNF_ERROR, + DNF_ERROR_INTERNAL_ERROR, +- _("repo_add_repomdxml/rpmmd() has failed.")); ++ _("Loading repomd has failed: %s"), ++ pool_errstr(repo->pool)); ++ retval = FALSE; ++ goto out; ++ } ++ ++ g_debug("Loading primary: %s", primary.c_str()); ++ if (repo_add_rpmmd(repo, fp_primary, 0, 0)) { ++ g_set_error (error, ++ DNF_ERROR, ++ DNF_ERROR_INTERNAL_ERROR, ++ _("Loading primary has failed: %s"), ++ pool_errstr(repo->pool)); + retval = FALSE; + goto out; + } +-- +2.31.1 + diff --git a/SOURCES/0033-libdnf-transaction-RPMItem-Fix-handling-transaction-.patch b/SOURCES/0033-libdnf-transaction-RPMItem-Fix-handling-transaction-.patch new file mode 100644 index 0000000..7398fc8 --- /dev/null +++ b/SOURCES/0033-libdnf-transaction-RPMItem-Fix-handling-transaction-.patch @@ -0,0 +1,74 @@ +From c5919efe898294420ec8e91e4eed5b9081e681c5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= +Date: Thu, 17 Feb 2022 18:18:16 +0100 +Subject: [PATCH 33/34] libdnf/transaction/RPMItem: Fix handling transaction id + in resolveTransactionItemReason + +The maxTransactionId argument was ignored, the method was always returning the +reason from the last transaction. This is the correct result for +maxTransactionId = -1. In a couple of places the method is called with +maxTransactionId = -2. Fixing this would mean nontrivial changes to the +logic which could potentially break something else, so I'm leaving this +behavior unchanged. + +For non-negative values of maxTransactionId (with which it's not being called +anywhere in dnf codebase), the commit adds a condition to SELECT only +transaction ids less than or equal to maxTransactionId. + += changelog = +msg: Fix handling transaction id in resolveTransactionItemReason +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2053014 +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2010259 +--- + libdnf/transaction/RPMItem.cpp | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/libdnf/transaction/RPMItem.cpp b/libdnf/transaction/RPMItem.cpp +index 5f667ab9..ecce789d 100644 +--- a/libdnf/transaction/RPMItem.cpp ++++ b/libdnf/transaction/RPMItem.cpp +@@ -255,7 +255,11 @@ RPMItem::resolveTransactionItemReason(SQLite3Ptr conn, + const std::string &arch, + int64_t maxTransactionId) + { +- const char *sql = R"**( ++ // NOTE: All negative maxTransactionId values are treated the same. The ++ // method is called with maxTransactionId = -2 in a couple of places, the ++ // semantics here have been the same as with -1 for a long time. If it ++ // ain't broke... ++ std::string sql = R"**( + SELECT + ti.action as action, + ti.reason as reason +@@ -271,14 +275,25 @@ RPMItem::resolveTransactionItemReason(SQLite3Ptr conn, + AND ti.action not in (3, 5, 7, 10) + AND i.name = ? + AND i.arch = ? ++ )**"; ++ ++ if (maxTransactionId >= 0) { ++ sql.append(" AND ti.trans_id <= ?"); ++ } ++ ++ sql.append(R"**( + ORDER BY + ti.trans_id DESC + LIMIT 1 +- )**"; ++ )**"); + + if (arch != "") { + SQLite3::Query query(*conn, sql); +- query.bindv(name, arch); ++ if (maxTransactionId >= 0) { ++ query.bindv(name, arch, maxTransactionId); ++ } else { ++ query.bindv(name, arch); ++ } + + if (query.step() == SQLite3::Statement::StepResult::ROW) { + auto action = static_cast< TransactionItemAction >(query.get< int64_t >("action")); +-- +2.31.1 + diff --git a/SOURCES/0034-libdnf-transaction-TransactionItem-Set-short-action-.patch b/SOURCES/0034-libdnf-transaction-TransactionItem-Set-short-action-.patch new file mode 100644 index 0000000..c7290c1 --- /dev/null +++ b/SOURCES/0034-libdnf-transaction-TransactionItem-Set-short-action-.patch @@ -0,0 +1,33 @@ +From c303b7c3723f3e9fbc43963a62237ea17516fc6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= +Date: Thu, 17 Feb 2022 18:30:14 +0100 +Subject: [PATCH 34/34] libdnf/transaction/TransactionItem: Set short action + for Reason Change + +Sets the "short" (one letter) representation of the Reason Change action +to "C". + +This was likely not ever used before as the only way to create a +transaction with a reason change and something else is rolling back +multiple transactions, which was broken. +--- + libdnf/transaction/TransactionItem.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libdnf/transaction/TransactionItem.cpp b/libdnf/transaction/TransactionItem.cpp +index 3b43d1f1..4358038e 100644 +--- a/libdnf/transaction/TransactionItem.cpp ++++ b/libdnf/transaction/TransactionItem.cpp +@@ -51,8 +51,7 @@ static const std::map< TransactionItemAction, std::string > transactionItemActio + {TransactionItemAction::REMOVE, "E"}, + {TransactionItemAction::REINSTALL, "R"}, + {TransactionItemAction::REINSTALLED, "R"}, +- // TODO: replace "?" with something better +- {TransactionItemAction::REASON_CHANGE, "?"}, ++ {TransactionItemAction::REASON_CHANGE, "C"}, + }; + + /* +-- +2.31.1 + diff --git a/SOURCES/0035-Do-not-print-errors-on-failovermethod-repo-option-Rh.patch b/SOURCES/0035-Do-not-print-errors-on-failovermethod-repo-option-Rh.patch new file mode 100644 index 0000000..b9ff0c3 --- /dev/null +++ b/SOURCES/0035-Do-not-print-errors-on-failovermethod-repo-option-Rh.patch @@ -0,0 +1,45 @@ +From c4ee580c73375060b6eb5b3414636688e3d601c3 Mon Sep 17 00:00:00 2001 +From: Marek Blaha +Date: Fri, 10 Jun 2022 15:29:56 +0200 +Subject: [PATCH] Do not print errors on failovermethod repo option + (RhBug:2039906) + += changelog = +msg: Do not print errors if repository config contains failovermethod option +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2039906 +--- + libdnf/conf/ConfigRepo.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libdnf/conf/ConfigRepo.cpp b/libdnf/conf/ConfigRepo.cpp +index e98ac0af..0cb52f58 100644 +--- a/libdnf/conf/ConfigRepo.cpp ++++ b/libdnf/conf/ConfigRepo.cpp +@@ -22,6 +22,8 @@ + #include "Const.hpp" + #include "Config-private.hpp" + ++#include "bgettext/bgettext-lib.h" ++ + namespace libdnf { + + class ConfigRepo::Impl { +@@ -174,6 +176,14 @@ ConfigRepo::Impl::Impl(Config & owner, ConfigMain & mainConfig) + owner.optBinds().add("enabled_metadata", enabled_metadata); + owner.optBinds().add("user_agent", user_agent); + owner.optBinds().add("countme", countme); ++ owner.optBinds().add("failovermethod", failovermethod, ++ [&](Option::Priority priority, const std::string & value){ ++ if (value != "priority") { ++ throw Option::InvalidValue(_("only the value 'priority' is supported.")); ++ } ++ failovermethod.set(priority, value); ++ }, nullptr, false ++ ); + owner.optBinds().add("sslverifystatus", sslverifystatus); + } + +-- +2.36.1 + diff --git a/SOURCES/0036-sack-query.hpp-Add-a-missing-include.patch b/SOURCES/0036-sack-query.hpp-Add-a-missing-include.patch new file mode 100644 index 0000000..1e3c5c0 --- /dev/null +++ b/SOURCES/0036-sack-query.hpp-Add-a-missing-include.patch @@ -0,0 +1,24 @@ +From 9dbd5f8f0ac3d6d3fab9147a3208623cba698682 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= +Date: Tue, 14 Jun 2022 17:26:44 +0200 +Subject: [PATCH] sack/query.hpp: Add a missing include + +--- + libdnf/sack/query.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libdnf/sack/query.hpp b/libdnf/sack/query.hpp +index 9e49761c..306b24e3 100644 +--- a/libdnf/sack/query.hpp ++++ b/libdnf/sack/query.hpp +@@ -26,6 +26,7 @@ + #include "../hy-types.h" + #include "../hy-query.h" + #include "../hy-subject.h" ++#include "../nevra.hpp" + #include "../repo/solvable/Dependency.hpp" + #include "../repo/solvable/DependencyContainer.hpp" + #include "../transaction/Swdb.hpp" +-- +2.36.1 + diff --git a/SOURCES/0037-context-dnf_context_remove-accepts-package-spec-as-d.patch b/SOURCES/0037-context-dnf_context_remove-accepts-package-spec-as-d.patch new file mode 100644 index 0000000..5c67e98 --- /dev/null +++ b/SOURCES/0037-context-dnf_context_remove-accepts-package-spec-as-d.patch @@ -0,0 +1,128 @@ +From 876393d5d0cd5f806415dcdc90168e58e66da916 Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Mon, 28 Mar 2022 07:29:48 +0200 +Subject: [PATCH] context: dnf_context_remove accepts `` as dnf, + unify code + +Prior to change, the `dnf_context_remove` function only accepted +the package name (without globs). It was not possible to enter more detailed +specifications and thus, for example, select a specific version of the package +to uninstall - for example, which kernel we want to uninstall. +This patch adds full `` support as in dnf, including support +for globs (wildcards) and searching against 'provides' and 'file provides'. + +Better error handling for `hy_goal_upgrade_selector` in` dnf_context_update`. + +Unification of the function code `dnf_context_install`, `dnf_context_remove`, +`dnf_context_update`. + += changelog = +msg: context: Support (NEVRA forms, provides, file provides) including globs in the dnf_context_remove func +type: enhancement +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2084602 +--- + libdnf/dnf-context.cpp | 46 ++++++++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 20 deletions(-) + +diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp +index 6cb0011b..4b055f03 100644 +--- a/libdnf/dnf-context.cpp ++++ b/libdnf/dnf-context.cpp +@@ -2391,10 +2391,9 @@ dnf_context_run(DnfContext *context, GCancellable *cancellable, GError **error) + * Since: 0.1.0 + **/ + gboolean +-dnf_context_install (DnfContext *context, const gchar *name, GError **error) try ++dnf_context_install(DnfContext *context, const gchar *name, GError **error) try + { + DnfContextPrivate *priv = GET_PRIVATE (context); +- g_autoptr(GPtrArray) selector_matches = NULL; + + /* create sack and add sources */ + if (priv->sack == NULL) { +@@ -2405,7 +2404,7 @@ dnf_context_install (DnfContext *context, const gchar *name, GError **error) try + + g_auto(HySubject) subject = hy_subject_create(name); + g_auto(HySelector) selector = hy_subject_get_best_selector(subject, priv->sack, NULL, FALSE, NULL); +- selector_matches = hy_selector_matches(selector); ++ g_autoptr(GPtrArray) selector_matches = hy_selector_matches(selector); + if (selector_matches->len == 0) { + g_set_error(error, + DNF_ERROR, +@@ -2438,31 +2437,33 @@ gboolean + dnf_context_remove(DnfContext *context, const gchar *name, GError **error) try + { + DnfContextPrivate *priv = GET_PRIVATE(context); +- GPtrArray *pkglist; +- hy_autoquery HyQuery query = NULL; +- gboolean ret = TRUE; +- guint i; + + /* create sack and add repos */ + if (priv->sack == NULL) { + dnf_state_reset(priv->state); +- ret = dnf_context_setup_sack(context, priv->state, error); +- if (!ret) ++ if (!dnf_context_setup_sack(context, priv->state, error)) + return FALSE; + } + +- /* find installed packages to remove */ +- query = hy_query_create(priv->sack); +- query->installed(); +- hy_query_filter(query, HY_PKG_NAME, HY_EQ, name); +- pkglist = hy_query_run(query); ++ libdnf::Query query(priv->sack, libdnf::Query::ExcludeFlags::APPLY_EXCLUDES); ++ query.installed(); ++ auto ret = query.filterSubject(name, nullptr, false, true, true, true); ++ if (!ret.first) { ++ g_set_error(error, ++ DNF_ERROR, ++ DNF_ERROR_PACKAGE_NOT_FOUND, ++ "No installed package matches '%s'", name); ++ return FALSE; ++ } ++ ++ g_autoptr(GPtrArray) packages = query.run(); + + /* add each package */ +- for (i = 0; i < pkglist->len; i++) { +- auto pkg = static_cast(g_ptr_array_index(pkglist, i)); ++ for (guint i = 0; i < packages->len; i++) { ++ auto pkg = static_cast(g_ptr_array_index(packages, i)); + hy_goal_erase(priv->goal, pkg); + } +- g_ptr_array_unref(pkglist); ++ + return TRUE; + } CATCH_TO_GERROR(FALSE) + +@@ -2493,8 +2494,7 @@ dnf_context_update(DnfContext *context, const gchar *name, GError **error) try + } + + g_auto(HySubject) subject = hy_subject_create(name); +- g_auto(HySelector) selector = hy_subject_get_best_selector(subject, priv->sack, NULL, FALSE, +- NULL); ++ g_auto(HySelector) selector = hy_subject_get_best_selector(subject, priv->sack, NULL, FALSE, NULL); + g_autoptr(GPtrArray) selector_matches = hy_selector_matches(selector); + if (selector_matches->len == 0) { + g_set_error(error, +@@ -2504,8 +2504,14 @@ dnf_context_update(DnfContext *context, const gchar *name, GError **error) try + return FALSE; + } + +- if (hy_goal_upgrade_selector(priv->goal, selector)) ++ int ret = hy_goal_upgrade_selector(priv->goal, selector); ++ if (ret != 0) { ++ g_set_error(error, ++ DNF_ERROR, ++ ret, ++ "Ill-formed Selector '%s'", name); + return FALSE; ++ } + + return TRUE; + } CATCH_TO_GERROR(FALSE) +-- +2.36.1 + diff --git a/SOURCES/0038-context-Fix-doc-dnf_context_install-remove-update-di.patch b/SOURCES/0038-context-Fix-doc-dnf_context_install-remove-update-di.patch new file mode 100644 index 0000000..379a770 --- /dev/null +++ b/SOURCES/0038-context-Fix-doc-dnf_context_install-remove-update-di.patch @@ -0,0 +1,62 @@ +From 44d75a36d7c8a933119e5b63f180a8c23715ec51 Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Mon, 28 Mar 2022 07:51:45 +0200 +Subject: [PATCH] context: Fix doc dnf_context_install/remove/update/distrosync + +Functions do not support groups - only packages are supported. + +The `dnf_context_remove` function marks all matching packages for removal +- not just the oldest one. +--- + libdnf/dnf-context.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp +index 4b055f03..fe005430 100644 +--- a/libdnf/dnf-context.cpp ++++ b/libdnf/dnf-context.cpp +@@ -2379,7 +2379,7 @@ dnf_context_run(DnfContext *context, GCancellable *cancellable, GError **error) + /** + * dnf_context_install: + * @context: a #DnfContext instance. +- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop" ++ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox" + * @error: A #GError or %NULL + * + * Finds a remote package and marks it to be installed. +@@ -2422,12 +2422,12 @@ dnf_context_install(DnfContext *context, const gchar *name, GError **error) try + /** + * dnf_context_remove: + * @context: a #DnfContext instance. +- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop" ++ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox" + * @error: A #GError or %NULL + * + * Finds an installed package and marks it to be removed. + * +- * If multiple packages are available then only the oldest package is removed. ++ * If multiple packages are available, all of them will be removed. + * + * Returns: %TRUE for success, %FALSE otherwise + * +@@ -2470,7 +2470,7 @@ dnf_context_remove(DnfContext *context, const gchar *name, GError **error) try + /** + * dnf_context_update: + * @context: a #DnfContext instance. +- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop" ++ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox" + * @error: A #GError or %NULL + * + * Finds an installed and remote package and marks it to be updated. +@@ -2548,7 +2548,7 @@ dnf_context_update_all (DnfContext *context, + /** + * dnf_context_distrosync: + * @context: a #DnfContext instance. +- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop" ++ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox" + * @error: A #GError or %NULL + * + * Finds an installed and remote package and marks it to be synchronized with remote version. +-- +2.36.1 + diff --git a/SOURCES/0027-advisory-upgrade-filter-out-advPkgs-with-different-a.patch b/SOURCES/0039-advisory-upgrade-filter-out-advPkgs-with-different-a.patch similarity index 98% rename from SOURCES/0027-advisory-upgrade-filter-out-advPkgs-with-different-a.patch rename to SOURCES/0039-advisory-upgrade-filter-out-advPkgs-with-different-a.patch index 9376f7d..ad93526 100644 --- a/SOURCES/0027-advisory-upgrade-filter-out-advPkgs-with-different-a.patch +++ b/SOURCES/0039-advisory-upgrade-filter-out-advPkgs-with-different-a.patch @@ -1,4 +1,4 @@ -From dd4862b4ff957ad2e535ace32a2f38706da64793 Mon Sep 17 00:00:00 2001 +From cf4893a0128c567ed1fdd1b02c9cf2b43bfb02f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Mon, 30 May 2022 08:59:41 +0200 Subject: [PATCH] advisory upgrade: filter out advPkgs with different arch diff --git a/SOURCES/0028-Add-obsoletes-to-filtering-for-advisory-candidates.patch b/SOURCES/0040-Add-obsoletes-to-filtering-for-advisory-candidates.patch similarity index 98% rename from SOURCES/0028-Add-obsoletes-to-filtering-for-advisory-candidates.patch rename to SOURCES/0040-Add-obsoletes-to-filtering-for-advisory-candidates.patch index 85a93de..e3f7167 100644 --- a/SOURCES/0028-Add-obsoletes-to-filtering-for-advisory-candidates.patch +++ b/SOURCES/0040-Add-obsoletes-to-filtering-for-advisory-candidates.patch @@ -1,4 +1,4 @@ -From fa6da3b29705b99de69a653e869af258ac302ab6 Mon Sep 17 00:00:00 2001 +From 652977360c4253faff9e95d35c603b2f585671fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Tue, 5 Jul 2022 09:02:22 +0200 Subject: [PATCH] Add obsoletes to filtering for advisory candidates @@ -67,5 +67,5 @@ index 03d39659..5355f9f7 100644 if (low != installed_solvables.end() && s->name == (*low)->name && s->arch == (*low)->arch) { candidates.push_back(s); -- -2.37.1 +2.36.1 diff --git a/SOURCES/0026-Update-translations-RhBug-2017272.patch b/SOURCES/0041-Update-translations-RHEL-8.7.patch similarity index 83% rename from SOURCES/0026-Update-translations-RhBug-2017272.patch rename to SOURCES/0041-Update-translations-RHEL-8.7.patch index a79437f..5fc5b2a 100644 --- a/SOURCES/0026-Update-translations-RhBug-2017272.patch +++ b/SOURCES/0041-Update-translations-RHEL-8.7.patch @@ -1,18 +1,18 @@ -From dbfe35f3601262c739966ed5a790d5bb3db9ae9a Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 18 Mar 2022 15:05:55 +0100 -Subject: [PATCH] Update translations (RhBug:2017272) +From 201d67559f2968ef9da503f751c72ded17e6f730 Mon Sep 17 00:00:00 2001 +From: Marek Blaha +Date: Wed, 14 Sep 2022 09:47:13 +0200 +Subject: [PATCH] Update translations RHEL 8.7 --- - po/fr.po | 500 ++++++++++++++++++++++----------- - po/ja.po | 550 +++++++++++++++++++++++++------------ - po/ko.po | 748 +++++++++++++++++++++++++++++++------------------- - po/libdnf.pot | 444 ++++++++++++++++++++---------- - po/zh_CN.po | 644 +++++++++++++++++++++++++++---------------- - 5 files changed, 1906 insertions(+), 980 deletions(-) + po/fr.po | 590 ++++++++++++++++++++++++----------- + po/ja.po | 643 ++++++++++++++++++++++++++++----------- + po/ko.po | 828 ++++++++++++++++++++++++++++++++------------------ + po/libdnf.pot | 504 +++++++++++++++++++++--------- + po/zh_CN.po | 752 +++++++++++++++++++++++++++++---------------- + 5 files changed, 2276 insertions(+), 1041 deletions(-) diff --git a/po/fr.po b/po/fr.po -index 055cdaf..4e7dd87 100644 +index 055cdaff..ba1ee96b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,23 +2,26 @@ @@ -33,7 +33,7 @@ index 055cdaf..4e7dd87 100644 -"PO-Revision-Date: 2020-06-29 02:40+0000\n" -"Last-Translator: Julien Humbert \n" -"Language-Team: French \n" -+"POT-Creation-Date: 2022-02-28 11:03+0100\n" ++"POT-Creation-Date: 2022-08-30 14:26+0200\n" +"PO-Revision-Date: 2021-10-10 00:45+0000\n" +"Last-Translator: Titouan Bénard \n" +"Language-Team: French , 2018. #zanata -# Ludek Janda , 2018. #zanata +# Ludek Janda , 2018. #zanata, 2021. # Casey Jones , 2020. +# Sundeep Anand , 2021. ++# Transtats , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -1095,9 +1185,9 @@ index b9064ee..94454a2 100644 -"PO-Revision-Date: 2020-05-05 09:40+0000\n" -"Last-Translator: Casey Jones \n" -"Language-Team: Japanese \n" -+"POT-Creation-Date: 2022-02-28 11:03+0100\n" -+"PO-Revision-Date: 2021-09-06 17:27+0000\n" -+"Last-Translator: Ludek Janda \n" ++"POT-Creation-Date: 2022-08-30 14:26+0200\n" ++"PO-Revision-Date: 2022-09-06 07:19+0000\n" ++"Last-Translator: Transtats \n" +"Language-Team: Japanese \n" "Language: ja\n" @@ -1106,11 +1196,20 @@ index b9064ee..94454a2 100644 "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.0.3\n" -+"X-Generator: Weblate 4.8\n" ++"X-Generator: Weblate 4.14\n" #: libdnf/conf/ConfigMain.cpp:62 libdnf/conf/OptionSeconds.cpp:40 msgid "no value specified" -@@ -35,17 +37,30 @@ msgstr "'%s' を バイトへ変換できませんでした" +@@ -23,7 +26,7 @@ msgstr "値が指定されていません" + #: libdnf/conf/ConfigMain.cpp:67 libdnf/conf/OptionSeconds.cpp:48 + #, c-format + msgid "seconds value '%s' must not be negative" +-msgstr "2個目の値 '%s' は負の数にしないでください" ++msgstr "2 個目の値 '%s' は負の数にしないでください" + + #: libdnf/conf/ConfigMain.cpp:71 + #, c-format +@@ -35,17 +38,34 @@ msgstr "'%s' を バイトへ変換できませんでした" msgid "unknown unit '%s'" msgstr "不明な単位 '%s'" @@ -1134,6 +1233,10 @@ index b9064ee..94454a2 100644 msgstr "パーセンテージ '%s' が範囲外にあります" -#: libdnf/conf/OptionBinds.cpp:76 ++#: libdnf/conf/ConfigRepo.cpp:182 ++msgid "only the value 'priority' is supported." ++msgstr "「priority」の値のみがサポートされます。" ++ +#: libdnf/conf/OptionBinds.cpp:85 #, c-format msgid "Configuration: OptionBinding with id \"%s\" does not exist" @@ -1144,7 +1247,7 @@ index b9064ee..94454a2 100644 #, c-format msgid "Configuration: OptionBinding with id \"%s\" already exists" msgstr "設定: id \"%s\" を伴う OptionBinding はすでに存在します" -@@ -56,24 +71,20 @@ msgid "invalid boolean value '%s'" +@@ -56,24 +76,20 @@ msgid "invalid boolean value '%s'" msgstr "無効な boolean 値 '%s'" #: libdnf/conf/OptionEnum.cpp:72 libdnf/conf/OptionEnum.cpp:158 @@ -1172,7 +1275,7 @@ index b9064ee..94454a2 100644 #: libdnf/conf/OptionPath.cpp:78 #, c-format -@@ -90,26 +101,137 @@ msgstr "指定されたパス '%s' が存在しません。" +@@ -90,26 +106,137 @@ msgstr "指定されたパス '%s' が存在しません。" msgid "could not convert '%s' to seconds" msgstr "'%s' を 秒に変換できません" @@ -1182,12 +1285,12 @@ index b9064ee..94454a2 100644 msgstr "GetValue(): 値は設定されていません" -#: libdnf/dnf-goal.cpp:68 -+#: libdnf/dnf-context.cpp:3170 libdnf/dnf-context.cpp:3179 ++#: libdnf/dnf-context.cpp:3176 libdnf/dnf-context.cpp:3185 +#, c-format +msgid "Cannot enable more streams from module '%s' at the same time" +msgstr "モジュール '%s' から、さらにストリームを同時に有効にできません" + -+#: libdnf/dnf-context.cpp:3188 libdnf/dnf-context.cpp:3206 ++#: libdnf/dnf-context.cpp:3194 libdnf/dnf-context.cpp:3212 +#, c-format +msgid "" +"Cannot enable module '%1$s' stream '%2$s': State of module already modified" @@ -1195,54 +1298,54 @@ index b9064ee..94454a2 100644 +"モジュール '%1$s' ストリーム '%2$s' を有効にできません。モジュールの状態はす" +"でに変更されています" + -+#: libdnf/dnf-context.cpp:3253 ++#: libdnf/dnf-context.cpp:3259 +#, c-format +msgid "Modular dependency problem with Defaults: %s" +msgstr "デフォルトのモジュラー依存問題: %s" + -+#: libdnf/dnf-context.cpp:3256 ++#: libdnf/dnf-context.cpp:3262 +#, c-format +msgid "Modular dependency problem: %s" +msgstr "モジュラーの依存に関する問題: %s" + -+#: libdnf/dnf-context.cpp:3290 libdnf/dnf-context.cpp:3314 -+#: libdnf/dnf-context.cpp:3325 libdnf/dnf-context.cpp:3364 -+#: libdnf/dnf-context.cpp:3380 libdnf/dnf-context.cpp:3412 -+#: libdnf/dnf-context.cpp:3456 libdnf/dnf-context.cpp:3466 ++#: libdnf/dnf-context.cpp:3296 libdnf/dnf-context.cpp:3320 ++#: libdnf/dnf-context.cpp:3331 libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3386 libdnf/dnf-context.cpp:3418 ++#: libdnf/dnf-context.cpp:3462 libdnf/dnf-context.cpp:3472 +#, c-format +msgid "Unable to resolve argument '%s'" +msgstr "引数 '%s' を解決できません" + -+#: libdnf/dnf-context.cpp:3297 ++#: libdnf/dnf-context.cpp:3303 +#, c-format +msgid "" +"Only module name is required. Ignoring unneeded information in argument: '%s'" +msgstr "モジュール名のみが必要です。引数の不必要な情報は無視します: '%s'" + -+#: libdnf/dnf-context.cpp:3311 ++#: libdnf/dnf-context.cpp:3317 +#, c-format +msgid "Cannot reset module '%s': State of module already modified" +msgstr "" +"モジュール '%s' をリセットできません。モジュールの状態はすでに変更されていま" +"す" + -+#: libdnf/dnf-context.cpp:3322 ++#: libdnf/dnf-context.cpp:3328 +#, c-format +msgid "Cannot disable module '%s': State of module already modified" +msgstr "" +"モジュール '%s' を無効にできません。モジュールの状態はすでに変更されています" + -+#: libdnf/dnf-context.cpp:3353 libdnf/dnf-context.cpp:3445 -+#: libdnf/dnf-context.cpp:3558 ++#: libdnf/dnf-context.cpp:3359 libdnf/dnf-context.cpp:3451 ++#: libdnf/dnf-context.cpp:3564 +msgid "No modular data available" +msgstr "モジュールデータは利用できません" + -+#: libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3376 +#, c-format +msgid "Ignoring unneeded information in argument: '%s'" +msgstr "引数の不要な情報は無視します: '%s'" + -+#: libdnf/dnf-context.cpp:3408 ++#: libdnf/dnf-context.cpp:3414 +#, c-format +msgid "" +"Problem during enablement of dependency tree for module '%1$s' stream " @@ -1250,29 +1353,29 @@ index b9064ee..94454a2 100644 +msgstr "" +"モジュール '%1$s' ストリーム '%2$s' の依存関係ツリーの有効化中に問題: %3$s" + -+#: libdnf/dnf-context.cpp:3420 ++#: libdnf/dnf-context.cpp:3426 +msgid "Problems appeared for module enable request" +msgstr "モジュール有効リクエストに発生する問題" + +#. this really should never happen; unless the modular repodata is corrupted -+#: libdnf/dnf-context.cpp:3495 ++#: libdnf/dnf-context.cpp:3501 +#, c-format +msgid "Failed to parse module artifact NEVRA '%s'" +msgstr "モジュールアーティファクト NEVRA '%s' の解析に失敗しました" + -+#: libdnf/dnf-context.cpp:3529 ++#: libdnf/dnf-context.cpp:3535 +msgid "Problems appeared for module install request" +msgstr "モジュールインストールリクエストに発生する問題" + -+#: libdnf/dnf-context.cpp:3589 ++#: libdnf/dnf-context.cpp:3595 +msgid "Problems appeared for module reset request" +msgstr "モジュールリセットリクエストに発生する問題" + -+#: libdnf/dnf-context.cpp:3591 ++#: libdnf/dnf-context.cpp:3597 +msgid "Problems appeared for module disable request" +msgstr "モジュール無効化リクエストに発生する問題" + -+#: libdnf/dnf-context.cpp:3627 ++#: libdnf/dnf-context.cpp:3633 +#, c-format +msgid "" +"The operation would result in switching of module '%s' stream '%s' to stream " @@ -1281,7 +1384,7 @@ index b9064ee..94454a2 100644 +"オペレーションは、モジュール '%s' ストリーム '%s' を ストリーム '%s' へと切り" +"替える結果となります" + -+#: libdnf/dnf-context.cpp:3631 ++#: libdnf/dnf-context.cpp:3637 +msgid "" +"It is not possible to switch enabled streams of a module.\n" +"It is recommended to remove all installed content from the module, and reset " @@ -1315,7 +1418,7 @@ index b9064ee..94454a2 100644 #, c-format msgid " Problem: %s\n" msgstr " 問題: %s\n" -@@ -119,7 +241,9 @@ msgstr " 問題: %s\n" +@@ -119,7 +246,9 @@ msgstr " 問題: %s\n" msgid "" "No available modular metadata for modular package '%s'; cannot be installed " "on the system" @@ -1326,7 +1429,7 @@ index b9064ee..94454a2 100644 #: libdnf/dnf-rpmts.cpp:121 libdnf/dnf-rpmts.cpp:166 #, c-format -@@ -158,7 +282,8 @@ msgstr "トランザクションの実行中にエラーが発生しました: % +@@ -158,7 +287,8 @@ msgstr "トランザクションの実行中にエラーが発生しました: % #: libdnf/dnf-rpmts.cpp:283 msgid "Error running transaction and no problems were reported!" @@ -1336,16 +1439,21 @@ index b9064ee..94454a2 100644 #: libdnf/dnf-rpmts.cpp:346 msgid "Fatal error, run database recovery" -@@ -174,87 +299,87 @@ msgstr "パッケージ %s を見つけることができませんでした" +@@ -174,87 +304,128 @@ msgstr "パッケージ %s を見つけることができませんでした" msgid "could not add erase element %1$s(%2$i)" msgstr "erase 要素 %1$s(%2$i) を追加することができません" -#: libdnf/dnf-sack.cpp:381 -+#: libdnf/dnf-sack.cpp:395 -+msgid "failed to add solv" -+msgstr "solv の追加に失敗しました" ++#: libdnf/dnf-sack.cpp:252 ++msgid "repo_add_solv() has failed." ++msgstr "repo_add_solv() は失敗しました。" + -+#: libdnf/dnf-sack.cpp:414 ++#: libdnf/dnf-sack.cpp:416 ++#, c-format ++msgid "Loading extension cache %s (%d) failed: " ++msgstr "拡張キャッシュの %s (%d) の読み込みに失敗しました: " ++ ++#: libdnf/dnf-sack.cpp:430 #, c-format msgid "no %1$s string for %2$s" msgstr "%2$s の %1$s 文字列はありません" @@ -1355,90 +1463,136 @@ index b9064ee..94454a2 100644 -msgstr "solv の追加に失敗しました" - -#: libdnf/dnf-sack.cpp:422 -+#: libdnf/dnf-sack.cpp:424 ++#: libdnf/dnf-sack.cpp:440 #, c-format msgid "failed to open: %s" msgstr "開くことに失敗しました: %s" -#: libdnf/dnf-sack.cpp:501 -+#: libdnf/dnf-sack.cpp:503 ++#: libdnf/dnf-sack.cpp:519 #, c-format msgid "cannot create temporary file: %s" msgstr "一時ファイルを作成できません: %s" -#: libdnf/dnf-sack.cpp:511 -+#: libdnf/dnf-sack.cpp:513 ++#: libdnf/dnf-sack.cpp:529 #, c-format msgid "failed opening tmp file: %s" msgstr "tmp ファイルを開くことに失敗しました: %s" -#: libdnf/dnf-sack.cpp:523 -+#: libdnf/dnf-sack.cpp:525 ++#: libdnf/dnf-sack.cpp:551 #, c-format - msgid "write_main() failed writing data: %i" - msgstr "write_main() はデータの書き込みに失敗しました: %i" +-msgid "write_main() failed writing data: %i" +-msgstr "write_main() はデータの書き込みに失敗しました: %i" ++msgid "While writing primary cache %s repowriter write failed: %i, error: %s" ++msgstr "プライマリーキャッシュの %s repowriter 書き込み中に %i " ++"エラーが発生しました。エラー: %s" -#: libdnf/dnf-sack.cpp:540 -+#: libdnf/dnf-sack.cpp:542 - msgid "write_main() failed to re-load written solv file" - msgstr "write_main() は、書き込みされた solv ファイルの再ロードに失敗しました" +-msgid "write_main() failed to re-load written solv file" +-msgstr "write_main() は、書き込みされた solv ファイルの再ロードに失敗しました" ++#: libdnf/dnf-sack.cpp:561 ++#, c-format ++msgid "Failed closing tmp file %s: %s" ++msgstr "tmp ファイル %s の終了に失敗しました: %s" ++ ++#: libdnf/dnf-sack.cpp:571 ++#, c-format ++msgid "Failed to use newly written primary cache: %s: " ++msgstr "新たに書き込まれたプライマリーキャッシュを使用できません: %s: " ++ ++#: libdnf/dnf-sack.cpp:577 ++#, c-format ++msgid "Failed to use newly written primary cache: %s" ++msgstr "新たに書き込まれたプライマリーキャッシュを使用できません: %s" -#: libdnf/dnf-sack.cpp:605 -+#: libdnf/dnf-sack.cpp:607 ++#: libdnf/dnf-sack.cpp:627 #, c-format msgid "can not create temporary file %s" msgstr "一時ファイル %s を作成できません" -#: libdnf/dnf-sack.cpp:623 -+#: libdnf/dnf-sack.cpp:625 ++#: libdnf/dnf-sack.cpp:667 #, c-format - msgid "write_ext(%1$d) has failed: %2$d" - msgstr "write_ext(%1$d) は失敗しました: %2$d" +-msgid "write_ext(%1$d) has failed: %2$d" +-msgstr "write_ext(%1$d) は失敗しました: %2$d" ++msgid "" ++"While writing extension cache %s (%d): repowriter write failed: %i, error: %s" ++msgstr "拡張キャッシュ %s (%d) の書き込み中: repowriter の書き込みに失敗: %i、エラー:" ++" %s" ++ ++#: libdnf/dnf-sack.cpp:677 ++#, c-format ++msgid "While writing extension cache (%d): cannot close temporary file: %s" ++msgstr "拡張キャッシュの書き込み中 (%d): 一時ファイルを終了できません: %s" ++ ++#: libdnf/dnf-sack.cpp:693 ++#, c-format ++msgid "Failed to use newly written extension cache: %s (%d): " ++msgstr "新たに書き込まれた拡張キャッシュを使用できませんでした: %s (%d): " ++ ++#: libdnf/dnf-sack.cpp:700 ++#, c-format ++msgid "Failed to use newly written extension cache: %s (%d)" ++msgstr "新たに書き込まれた拡張キャッシュを使用できませんでした: %s (%d)" -#: libdnf/dnf-sack.cpp:678 -+#: libdnf/dnf-sack.cpp:680 ++#: libdnf/dnf-sack.cpp:741 msgid "null repo md file" msgstr "null repo md ファイル" -#: libdnf/dnf-sack.cpp:687 -+#: libdnf/dnf-sack.cpp:689 ++#: libdnf/dnf-sack.cpp:750 #, c-format msgid "can not read file %1$s: %2$s" msgstr "ファイル %1$s を読み込みできません: %2$s" -#: libdnf/dnf-sack.cpp:701 -+#: libdnf/dnf-sack.cpp:703 - msgid "repo_add_solv() has failed." - msgstr "repo_add_solv() は失敗しました。" +-msgid "repo_add_solv() has failed." +-msgstr "repo_add_solv() は失敗しました。" ++#: libdnf/dnf-sack.cpp:765 ++#, c-format ++msgid "While loading repository failed to use %s: " ++msgstr "リポジトリーのロード中に %s が使用できませんでした: " -#: libdnf/dnf-sack.cpp:714 -+#: libdnf/dnf-sack.cpp:716 ++#: libdnf/dnf-sack.cpp:776 msgid "loading of MD_TYPE_PRIMARY has failed." msgstr "MD_TYPE_PRIMARY のロードに失敗しました。" -#: libdnf/dnf-sack.cpp:727 -+#: libdnf/dnf-sack.cpp:729 - msgid "repo_add_repomdxml/rpmmd() has failed." - msgstr "repo_add_repomdxml/rpmmd() は失敗しました。" +-msgid "repo_add_repomdxml/rpmmd() has failed." +-msgstr "repo_add_repomdxml/rpmmd() は失敗しました。" ++#: libdnf/dnf-sack.cpp:788 ++#, c-format ++msgid "Loading repomd has failed: %s" ++msgstr "repomd の読み込みに失敗しました: %s" ++ ++#: libdnf/dnf-sack.cpp:799 ++#, c-format ++msgid "Loading primary has failed: %s" ++msgstr "プライマリーの読み込みに失敗しました: %s" -#: libdnf/dnf-sack.cpp:794 -+#: libdnf/dnf-sack.cpp:796 ++#: libdnf/dnf-sack.cpp:865 msgid "failed to auto-detect architecture" msgstr "アーキテクチャーの自動検出に失敗しました" -#: libdnf/dnf-sack.cpp:919 -+#: libdnf/dnf-sack.cpp:961 ++#: libdnf/dnf-sack.cpp:1030 #, c-format msgid "failed creating cachedir %s" msgstr "cachedir %s の作成に失敗しました" -#: libdnf/dnf-sack.cpp:1696 -+#: libdnf/dnf-sack.cpp:1738 ++#: libdnf/dnf-sack.cpp:1807 msgid "failed loading RPMDB" msgstr "RPMDB のロードに失敗しました" -#: libdnf/dnf-sack.cpp:2403 -+#: libdnf/dnf-sack.cpp:2463 ++#: libdnf/dnf-sack.cpp:2532 #, c-format msgid "No module defaults found: %s" -msgstr "" @@ -1446,7 +1600,7 @@ index b9064ee..94454a2 100644 #: libdnf/dnf-state.cpp:1184 #, c-format -@@ -288,7 +413,9 @@ msgstr "パッケージ %s を確実にしようとする場合、ソースは +@@ -288,7 +459,9 @@ msgstr "パッケージ %s を確実にしようとする場合、ソースは #: libdnf/dnf-transaction.cpp:326 #, c-format msgid "Failed to ensure %1$s as repo %2$s not found(%3$i repos loaded)" @@ -1457,7 +1611,7 @@ index b9064ee..94454a2 100644 #: libdnf/dnf-transaction.cpp:367 msgid "Failed to check untrusted: " -@@ -302,7 +429,8 @@ msgstr "%s にダウンロードしたファイルが見つかりませんでし +@@ -302,7 +475,8 @@ msgstr "%s にダウンロードしたファイルが見つかりませんでし #: libdnf/dnf-transaction.cpp:397 #, c-format msgid "package %1$s cannot be verified and repo %2$s is GPG enabled: %3$s" @@ -1467,7 +1621,7 @@ index b9064ee..94454a2 100644 #: libdnf/dnf-transaction.cpp:831 libdnf/dnf-transaction.cpp:903 msgid "Failed to get value for CacheDir" -@@ -321,28 +449,31 @@ msgstr "%s に filesystem をフリーサイズで取得することに失敗し +@@ -321,28 +495,31 @@ msgstr "%s に filesystem をフリーサイズで取得することに失敗し #: libdnf/dnf-transaction.cpp:935 #, c-format msgid "Not enough free space in %1$s: needed %2$s, available %3$s" @@ -1502,11 +1656,11 @@ index b9064ee..94454a2 100644 +"せんでした" -#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:399 -+#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:403 ++#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:485 #, c-format msgid "cannot open directory %1$s: %2$s" msgstr "ディレクトリー %1$s を開くことができません: %2$s" -@@ -352,272 +483,289 @@ msgstr "ディレクトリー %1$s を開くことができません: %2$s" +@@ -352,272 +529,294 @@ msgstr "ディレクトリー %1$s を開くことができません: %2$s" msgid "failed to remove %s" msgstr "%s の削除に失敗しました" @@ -1802,25 +1956,30 @@ index b9064ee..94454a2 100644 msgstr "操作は結果的に以下の保護されたパッケージを削除します: " -#: libdnf/hy-iutil.cpp:322 -+#: libdnf/hy-iutil.cpp:326 ++#: libdnf/hy-iutil.cpp:181 ++#, c-format ++msgid "Libsolv's solv_toolversion is: %zu long but we expect max of: %zu" ++msgstr "Libsolv の solv_toolversion の長さ: %zu ですが、最大の想定値: %zu です" ++ ++#: libdnf/hy-iutil.cpp:408 #, c-format msgid "Failed renaming %1$s to %2$s: %3$s" msgstr "名前を %1$s から %2$s へ変更できませんでした: %3$s" -#: libdnf/hy-iutil.cpp:330 -+#: libdnf/hy-iutil.cpp:334 ++#: libdnf/hy-iutil.cpp:416 #, c-format msgid "Failed setting perms on %1$s: %2$s" msgstr "%1$s に権限を設定できませんでした: %2$s" -#: libdnf/hy-iutil.cpp:376 -+#: libdnf/hy-iutil.cpp:380 ++#: libdnf/hy-iutil.cpp:462 #, c-format msgid "cannot create directory %1$s: %2$s" msgstr "ディレクトリー %1$s を作成できません : %2$s" -#: libdnf/hy-iutil.cpp:411 -+#: libdnf/hy-iutil.cpp:415 ++#: libdnf/hy-iutil.cpp:497 #, c-format msgid "cannot stat path %1$s: %2$s" msgstr "パス %1$s のstatを調べられません : %2$s" @@ -1858,7 +2017,7 @@ index b9064ee..94454a2 100644 msgid "No valid Platform ID detected" msgstr "有効な Platform ID が検出されませんでした" -@@ -626,36 +774,71 @@ msgstr "有効な Platform ID が検出されませんでした" +@@ -626,36 +825,71 @@ msgstr "有効な Platform ID が検出されませんでした" msgid "Cannot enable multiple streams for module '%s'" msgstr "モジュール '%s' の複数ストリームを有効化できません" @@ -1937,7 +2096,7 @@ index b9064ee..94454a2 100644 #: libdnf/module/modulemd/ModuleMetadata.cpp:86 #, c-format msgid "Failed to update from string: %s" -@@ -669,7 +852,7 @@ msgstr "名前解決に失敗しました: %s" +@@ -669,7 +903,7 @@ msgstr "名前解決に失敗しました: %s" #: libdnf/module/modulemd/ModuleMetadata.cpp:115 #, c-format msgid "There were errors while resolving modular defaults: %s" @@ -1946,7 +2105,7 @@ index b9064ee..94454a2 100644 #: libdnf/module/modulemd/ModuleMetadata.cpp:120 #, c-format -@@ -681,6 +864,12 @@ msgstr "デフォルトのアップグレードに失敗しました: %s" +@@ -681,6 +915,12 @@ msgstr "デフォルトのアップグレードに失敗しました: %s" msgid "Failed to upgrade streams: %s" msgstr "ストリームのアップグレードに失敗しました: %s" @@ -1959,7 +2118,7 @@ index b9064ee..94454a2 100644 #: libdnf/plugin/plugin.cpp:46 #, c-format msgid "Can't load shared library \"%s\": %s" -@@ -722,6 +911,9 @@ msgid "" +@@ -722,6 +962,9 @@ msgid "" "deprecated and the support will be dropped in future versions. Use '=' " "operator instead." msgstr "" @@ -1969,7 +2128,7 @@ index b9064ee..94454a2 100644 #: libdnf/repo/Repo.cpp:321 #, c-format -@@ -731,148 +923,172 @@ msgstr "リポジトリー %s にはミラーまたは baseurl セットがあ +@@ -731,148 +974,172 @@ msgstr "リポジトリー %s にはミラーまたは baseurl セットがあ #: libdnf/repo/Repo.cpp:330 #, c-format msgid "Repository '%s' has unsupported type: 'type=%s', skipping." @@ -2179,7 +2338,7 @@ index b9064ee..94454a2 100644 #, c-format msgid "Log handler with id %ld doesn't exist" msgstr "id %ld を伴うログハンドラーは存在しません" -@@ -881,13 +1097,13 @@ msgstr "id %ld を伴うログハンドラーは存在しません" +@@ -881,27 +1148,28 @@ msgstr "id %ld を伴うログハンドラーは存在しません" msgid "In progress" msgstr "進行中" @@ -2197,7 +2356,16 @@ index b9064ee..94454a2 100644 msgid "No transaction in progress" msgstr "進行中のトランザクションはありません" -@@ -902,6 +1118,7 @@ msgstr "完了したトランザクションにトランザクションアイテ +-#: libdnf/transaction/TransactionItem.cpp:147 ++#: libdnf/transaction/TransactionItem.cpp:146 + msgid "Attempt to insert transaction item into completed transaction" + msgstr "完了したトランザクションにトランザクションアイテムの挿入を試みます" + +-#: libdnf/transaction/TransactionItem.cpp:218 ++#: libdnf/transaction/TransactionItem.cpp:217 + msgid "Attempt to update transaction item in completed transaction" + msgstr "完了したトランザクションにトランザクションアイテムの更新を試みます" + #: libdnf/transaction/Transformer.cpp:76 msgid "Database Corrupted: no row 'version' in table 'config'" msgstr "" @@ -2205,24 +2373,43 @@ index b9064ee..94454a2 100644 #: libdnf/transaction/Transformer.cpp:681 msgid "Transformer: can't open history persist dir" -@@ -926,6 +1143,3 @@ msgstr "未保存のトランザクションにコンソールの出力を追加 +@@ -924,8 +1192,21 @@ msgstr "TransactionItem の状態は設定されていません: %s" + msgid "Can't add console output to unsaved transaction" + msgstr "未保存のトランザクションにコンソールの出力を追加できません" ++#~ msgid "failed to add solv" ++#~ msgstr "solv の追加に失敗しました" ++ ++#~ msgid "write_main() failed writing data: %i" ++#~ msgstr "write_main() はデータの書き込みに失敗しました: %i" ++ ++#~ msgid "write_main() failed to re-load written solv file" ++#~ msgstr "" ++#~ "write_main() は、書き込みされた solv ファイルの再ロードに失敗しました" ++ ++#~ msgid "write_ext(%1$d) has failed: %2$d" ++#~ msgstr "write_ext(%1$d) は失敗しました: %2$d" ++ ++#~ msgid "repo_add_repomdxml/rpmmd() has failed." ++#~ msgstr "repo_add_repomdxml/rpmmd() は失敗しました。" ++ #~ msgid "Bad id for repo: %s, byte = %s %d" #~ msgstr "repo に対する不正な id: %s, byte = %s %d" - -#~ msgid "failed calculating RPMDB checksum" -#~ msgstr "RPMDB チェックサムの計算に失敗しました" diff --git a/po/ko.po b/po/ko.po -index 4809483..b3d0310 100644 +index 48094831..b5df8814 100644 --- a/po/ko.po +++ b/po/ko.po -@@ -1,31 +1,32 @@ +@@ -1,31 +1,33 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. # Ludek Janda , 2018. #zanata +# simmon , 2021. ++# 김인수 , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -2231,9 +2418,9 @@ index 4809483..b3d0310 100644 -"PO-Revision-Date: 2018-11-02 05:26+0000\n" -"Last-Translator: Copied by Zanata \n" -"Language-Team: Korean\n" -+"POT-Creation-Date: 2022-02-28 11:03+0100\n" -+"PO-Revision-Date: 2021-11-04 08:05+0000\n" -+"Last-Translator: simmon \n" ++"POT-Creation-Date: 2022-08-30 14:26+0200\n" ++"PO-Revision-Date: 2022-09-02 02:19+0000\n" ++"Last-Translator: 김인수 \n" +"Language-Team: Korean \n" "Language: ko\n" @@ -2243,7 +2430,7 @@ index 4809483..b3d0310 100644 -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: Zanata 4.6.2\n" +"Plural-Forms: nplurals=1; plural=0;\n" -+"X-Generator: Weblate 4.8\n" ++"X-Generator: Weblate 4.14\n" #: libdnf/conf/ConfigMain.cpp:62 libdnf/conf/OptionSeconds.cpp:40 msgid "no value specified" @@ -2258,7 +2445,7 @@ index 4809483..b3d0310 100644 #: libdnf/conf/ConfigMain.cpp:71 #, c-format -@@ -37,17 +38,30 @@ msgstr "변환 할 수 없습니다 '%s'~ 바이트" +@@ -37,17 +39,34 @@ msgstr "변환 할 수 없습니다 '%s'~ 바이트" msgid "unknown unit '%s'" msgstr "알 수없는 단위 '%s'" @@ -2281,6 +2468,10 @@ index 4809483..b3d0310 100644 msgid "percentage '%s' is out of range" -msgstr "백분율 '%s'범위를 벗어났습니다." +msgstr "백분율 '%s' 범위를 벗어났습니다" ++ ++#: libdnf/conf/ConfigRepo.cpp:182 ++msgid "only the value 'priority' is supported." ++msgstr "'우선순위' 값만 지원됩니다." -#: libdnf/conf/OptionBinds.cpp:76 +#: libdnf/conf/OptionBinds.cpp:85 @@ -2293,7 +2484,7 @@ index 4809483..b3d0310 100644 #, c-format msgid "Configuration: OptionBinding with id \"%s\" already exists" msgstr "구성 : ID가 \"%s\" 이미 존재 함" -@@ -58,14 +72,10 @@ msgid "invalid boolean value '%s'" +@@ -58,14 +77,10 @@ msgid "invalid boolean value '%s'" msgstr "유효하지 않은 부울 값 '%s'" #: libdnf/conf/OptionEnum.cpp:72 libdnf/conf/OptionEnum.cpp:158 @@ -2310,7 +2501,7 @@ index 4809483..b3d0310 100644 #: libdnf/conf/OptionNumber.cpp:73 #, c-format -@@ -92,29 +102,136 @@ msgstr "주어진 경로 '%s' 존재하지 않는다." +@@ -92,29 +107,136 @@ msgstr "주어진 경로 '%s' 존재하지 않는다." msgid "could not convert '%s' to seconds" msgstr "변환 할 수 없습니다 '%s'초까지" @@ -2322,64 +2513,65 @@ index 4809483..b3d0310 100644 -#: libdnf/dnf-goal.cpp:68 -msgid "Could not depsolve transaction; " -+#: libdnf/dnf-context.cpp:3170 libdnf/dnf-context.cpp:3179 ++#: libdnf/dnf-context.cpp:3176 libdnf/dnf-context.cpp:3185 +#, c-format +msgid "Cannot enable more streams from module '%s' at the same time" +msgstr "동시에 모듈 '%s’에서 다른 스트림을 활성화 할 수 없습니다" + -+#: libdnf/dnf-context.cpp:3188 libdnf/dnf-context.cpp:3206 ++#: libdnf/dnf-context.cpp:3194 libdnf/dnf-context.cpp:3212 +#, c-format +msgid "" +"Cannot enable module '%1$s' stream '%2$s': State of module already modified" -+msgstr "" + msgstr "" +"모듈 '%1$s' 스트림 '%2$s 을 활성화 할 수 없습니다: 모듈 상태가 이미 변경되었" +"습니다" + -+#: libdnf/dnf-context.cpp:3253 ++#: libdnf/dnf-context.cpp:3259 +#, c-format +msgid "Modular dependency problem with Defaults: %s" +msgstr "기본설정에 모듈 의존성 문제: %s" + -+#: libdnf/dnf-context.cpp:3256 ++#: libdnf/dnf-context.cpp:3262 +#, c-format +msgid "Modular dependency problem: %s" +msgstr "모듈러 의존성 문제: %s" + -+#: libdnf/dnf-context.cpp:3290 libdnf/dnf-context.cpp:3314 -+#: libdnf/dnf-context.cpp:3325 libdnf/dnf-context.cpp:3364 -+#: libdnf/dnf-context.cpp:3380 libdnf/dnf-context.cpp:3412 -+#: libdnf/dnf-context.cpp:3456 libdnf/dnf-context.cpp:3466 ++#: libdnf/dnf-context.cpp:3296 libdnf/dnf-context.cpp:3320 ++#: libdnf/dnf-context.cpp:3331 libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3386 libdnf/dnf-context.cpp:3418 ++#: libdnf/dnf-context.cpp:3462 libdnf/dnf-context.cpp:3472 +#, c-format +msgid "Unable to resolve argument '%s'" +msgstr "인수 %s를 해결 할 수 없습니다" -+ -+#: libdnf/dnf-context.cpp:3297 + +-#: libdnf/dnf-goal.cpp:70 ++#: libdnf/dnf-context.cpp:3303 +#, c-format +msgid "" +"Only module name is required. Ignoring unneeded information in argument: '%s'" +msgstr "모듈 이름만 필요합니다. 인수에서 불필요한 정보를 무시합니다: '%s'" + -+#: libdnf/dnf-context.cpp:3311 ++#: libdnf/dnf-context.cpp:3317 +#, c-format +msgid "Cannot reset module '%s': State of module already modified" +msgstr "모듈 '%s 를 재설정 할 수 없습니다: 모듈 상태가 이미 변경되었습니다" + -+#: libdnf/dnf-context.cpp:3322 ++#: libdnf/dnf-context.cpp:3328 +#, c-format +msgid "Cannot disable module '%s': State of module already modified" +msgstr "모듈 '%s'사용 할 수 없습니다: 모듈 상태는 이미 적재되었습니다" + -+#: libdnf/dnf-context.cpp:3353 libdnf/dnf-context.cpp:3445 -+#: libdnf/dnf-context.cpp:3558 ++#: libdnf/dnf-context.cpp:3359 libdnf/dnf-context.cpp:3451 ++#: libdnf/dnf-context.cpp:3564 +msgid "No modular data available" +msgstr "모듈러 자료를 이용 할 수 없습니다" + -+#: libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3376 +#, c-format +msgid "Ignoring unneeded information in argument: '%s'" +msgstr "인수: '%s'에 불필요한 정보를 무시하기" + -+#: libdnf/dnf-context.cpp:3408 ++#: libdnf/dnf-context.cpp:3414 +#, c-format +msgid "" +"Problem during enablement of dependency tree for module '%1$s' stream " @@ -2388,48 +2580,47 @@ index 4809483..b3d0310 100644 +"모듈 '%1$s' 스트림 '%2$s': %3$s 위해 의존성 트리의 활성화하는 중에 발생하는 " +"문제" + -+#: libdnf/dnf-context.cpp:3420 ++#: libdnf/dnf-context.cpp:3426 +msgid "Problems appeared for module enable request" +msgstr "모듈 활성화 요청에 나타난 문제" + +#. this really should never happen; unless the modular repodata is corrupted -+#: libdnf/dnf-context.cpp:3495 ++#: libdnf/dnf-context.cpp:3501 +#, c-format +msgid "Failed to parse module artifact NEVRA '%s'" +msgstr "모듈 artifact NERVE '%s' 구분 분석에 실패함" + -+#: libdnf/dnf-context.cpp:3529 ++#: libdnf/dnf-context.cpp:3535 +msgid "Problems appeared for module install request" +msgstr "모듈 설치 요청을 위해 나타난 문제" + -+#: libdnf/dnf-context.cpp:3589 ++#: libdnf/dnf-context.cpp:3595 +msgid "Problems appeared for module reset request" +msgstr "모듈 초기화 요청을 위해 나나탄 문제" + -+#: libdnf/dnf-context.cpp:3591 ++#: libdnf/dnf-context.cpp:3597 +msgid "Problems appeared for module disable request" +msgstr "모듈 비활성화 요청을 위해 나타난 문제" + -+#: libdnf/dnf-context.cpp:3627 ++#: libdnf/dnf-context.cpp:3633 +#, c-format +msgid "" +"The operation would result in switching of module '%s' stream '%s' to stream " +"'%s'" +msgstr "이 동작은 모듈 '%s'' 스트림 ‘%s'에서 스트림 '%s'로의 전환 결과입니다" + -+#: libdnf/dnf-context.cpp:3631 ++#: libdnf/dnf-context.cpp:3637 +msgid "" +"It is not possible to switch enabled streams of a module.\n" +"It is recommended to remove all installed content from the module, and reset " +"the module using 'microdnf module reset ' command. After you " +"reset the module, you can install the other stream." - msgstr "" ++msgstr "" +"활성화된 모듈 스트림을 전환 할 수 없습니다.\n" +"설치된 모든 내용을 모듈에서 제거하고 ‘' 명령을 사용하여 모듈을 " +"재설정하는 것이 좋습니다. 모듈을 재설정한 후, 다른 스트림을 설치 할 수 있습니" +"다." - --#: libdnf/dnf-goal.cpp:70 ++ +#: libdnf/dnf-goal.cpp:85 +msgid "Could not depsolve transaction; " +msgstr "연결을 해제 할 수 없습니다; " @@ -2457,7 +2648,7 @@ index 4809483..b3d0310 100644 #: libdnf/dnf-rpmts.cpp:79 #, c-format -@@ -122,6 +239,8 @@ msgid "" +@@ -122,6 +244,8 @@ msgid "" "No available modular metadata for modular package '%s'; cannot be installed " "on the system" msgstr "" @@ -2466,7 +2657,7 @@ index 4809483..b3d0310 100644 #: libdnf/dnf-rpmts.cpp:121 libdnf/dnf-rpmts.cpp:166 #, c-format -@@ -156,11 +275,12 @@ msgstr "설치 요소를 추가하지 못했습니다. %1$s [%2$i]" +@@ -156,11 +280,12 @@ msgstr "설치 요소를 추가하지 못했습니다. %1$s [%2$i]" #: libdnf/dnf-rpmts.cpp:274 #, c-format msgid "Error running transaction: %s" @@ -2481,117 +2672,162 @@ index 4809483..b3d0310 100644 #: libdnf/dnf-rpmts.cpp:346 msgid "Fatal error, run database recovery" -@@ -176,87 +296,87 @@ msgstr "꾸러미를 찾지 못했습니다. %s" +@@ -176,87 +301,126 @@ msgstr "꾸러미를 찾지 못했습니다. %s" msgid "could not add erase element %1$s(%2$i)" msgstr "요소 지우기를 추가 할 수 없습니다. %1$s(%2$i)" -#: libdnf/dnf-sack.cpp:381 -+#: libdnf/dnf-sack.cpp:395 -+msgid "failed to add solv" -+msgstr "solv를 추가하지 못했습니다" ++#: libdnf/dnf-sack.cpp:252 ++msgid "repo_add_solv() has failed." ++msgstr "repo_add_solv() 실패하였습니다." + -+#: libdnf/dnf-sack.cpp:414 ++#: libdnf/dnf-sack.cpp:416 #, c-format - msgid "no %1$s string for %2$s" +-msgid "no %1$s string for %2$s" -msgstr "" -- ++msgid "Loading extension cache %s (%d) failed: " ++msgstr "확장 캐쉬 %s (%d) 적재 중 실패함: " + -#: libdnf/dnf-sack.cpp:404 -msgid "failed to add solv" -msgstr "solv를 추가하지 못했습니다." ++#: libdnf/dnf-sack.cpp:430 ++#, c-format ++msgid "no %1$s string for %2$s" +msgstr "%2$s에 %1$s 문자열이 없습니다" -#: libdnf/dnf-sack.cpp:422 -+#: libdnf/dnf-sack.cpp:424 ++#: libdnf/dnf-sack.cpp:440 #, c-format msgid "failed to open: %s" msgstr "열지 못했습니다 : %s" -#: libdnf/dnf-sack.cpp:501 -+#: libdnf/dnf-sack.cpp:503 ++#: libdnf/dnf-sack.cpp:519 #, c-format msgid "cannot create temporary file: %s" msgstr "임시 파일을 만들 수 없습니다. %s" -#: libdnf/dnf-sack.cpp:511 -+#: libdnf/dnf-sack.cpp:513 ++#: libdnf/dnf-sack.cpp:529 #, c-format msgid "failed opening tmp file: %s" msgstr "여는 tmp 파일을 열지 못했습니다. %s" -#: libdnf/dnf-sack.cpp:523 -+#: libdnf/dnf-sack.cpp:525 ++#: libdnf/dnf-sack.cpp:551 #, c-format - msgid "write_main() failed writing data: %i" +-msgid "write_main() failed writing data: %i" -msgstr "write_main() failed writing data: %i" -+msgstr "write_main() 실패한 쓰기 자료: %i" ++msgid "While writing primary cache %s repowriter write failed: %i, error: %s" ++msgstr "기본 캐쉬 %s를 쓰는 동안에 repowriter 쓰기가 실패함: %i, 오류: %s" -#: libdnf/dnf-sack.cpp:540 -+#: libdnf/dnf-sack.cpp:542 - msgid "write_main() failed to re-load written solv file" +-msgid "write_main() failed to re-load written solv file" -msgstr "write_main ()이 작성된 solv 파일을 다시로드하지 못했습니다." -+msgstr "write_main ()이 작성된 solv 파일을 다시 적재하지 못했습니다" ++#: libdnf/dnf-sack.cpp:561 ++#, c-format ++msgid "Failed closing tmp file %s: %s" ++msgstr "tmp 파일을 닫는데 실패함 %s: %s" -#: libdnf/dnf-sack.cpp:605 -+#: libdnf/dnf-sack.cpp:607 ++#: libdnf/dnf-sack.cpp:571 ++#, c-format ++msgid "Failed to use newly written primary cache: %s: " ++msgstr "새롭게 작성된 기본 캐쉬를 사용하는데 실패함: %s: " ++ ++#: libdnf/dnf-sack.cpp:577 ++#, c-format ++msgid "Failed to use newly written primary cache: %s" ++msgstr "새롭게 작성된 기본 캐쉬를 사용하는데 실패함: %s" ++ ++#: libdnf/dnf-sack.cpp:627 #, c-format msgid "can not create temporary file %s" msgstr "임시 파일을 만들 수 없습니다. %s" -#: libdnf/dnf-sack.cpp:623 -+#: libdnf/dnf-sack.cpp:625 ++#: libdnf/dnf-sack.cpp:667 ++#, c-format ++msgid "" ++"While writing extension cache %s (%d): repowriter write failed: %i, error: %s" ++msgstr "확장 캐쉬 %s (%d)를 쓰는 동안: repowriter 쓰기가 실패함: %i, 오류: %s" ++ ++#: libdnf/dnf-sack.cpp:677 ++#, c-format ++msgid "While writing extension cache (%d): cannot close temporary file: %s" ++msgstr "확장 캐쉬 (%d)를 쓰는 동안: 임시 파일을 닫을 수 없습니다: %s" ++ ++#: libdnf/dnf-sack.cpp:693 #, c-format - msgid "write_ext(%1$d) has failed: %2$d" +-msgid "write_ext(%1$d) has failed: %2$d" -msgstr "write_ext(%1$d) has failed: %2$d" -+msgstr "write_ext(%1$d) 실패하였습니다: %2$d" ++msgid "Failed to use newly written extension cache: %s (%d): " ++msgstr "새롭게 작성된 확장 캐쉬를 사용하는데 실패함: %s (%d): " -#: libdnf/dnf-sack.cpp:678 -+#: libdnf/dnf-sack.cpp:680 ++#: libdnf/dnf-sack.cpp:700 ++#, c-format ++msgid "Failed to use newly written extension cache: %s (%d)" ++msgstr "새롭게 작성된 확장 캐쉬를 사용하는데 실패함: %s (%d)" ++ ++#: libdnf/dnf-sack.cpp:741 msgid "null repo md file" msgstr "null repo md 파일" -#: libdnf/dnf-sack.cpp:687 -+#: libdnf/dnf-sack.cpp:689 ++#: libdnf/dnf-sack.cpp:750 #, c-format msgid "can not read file %1$s: %2$s" msgstr "파일을 읽을 수 없습니다. %1$s: %2$s" -#: libdnf/dnf-sack.cpp:701 -+#: libdnf/dnf-sack.cpp:703 - msgid "repo_add_solv() has failed." +-msgid "repo_add_solv() has failed." -msgstr "repo_add_solv() has failed." -+msgstr "repo_add_solv() 실패하였습니다." ++#: libdnf/dnf-sack.cpp:765 ++#, c-format ++msgid "While loading repository failed to use %s: " ++msgstr "저장소를 적재하는 동안에 %s를 사용하는데 실패함: " -#: libdnf/dnf-sack.cpp:714 -+#: libdnf/dnf-sack.cpp:716 ++#: libdnf/dnf-sack.cpp:776 msgid "loading of MD_TYPE_PRIMARY has failed." -msgstr "" +msgstr "MD_TYPE_PRIMARY를 적재하지 못했습니다." ++ ++#: libdnf/dnf-sack.cpp:788 ++#, c-format ++msgid "Loading repomd has failed: %s" ++msgstr "repomd 적재하는데 실패함: %s" -#: libdnf/dnf-sack.cpp:727 -+#: libdnf/dnf-sack.cpp:729 - msgid "repo_add_repomdxml/rpmmd() has failed." +-msgid "repo_add_repomdxml/rpmmd() has failed." -msgstr "repo_add_repomdxml/rpmmd() has failed." -+msgstr "repo_add_repomdxml/rpmmd() 실패하였습니다." ++#: libdnf/dnf-sack.cpp:799 ++#, c-format ++msgid "Loading primary has failed: %s" ++msgstr "기본 적재하는데 실패함: %s" -#: libdnf/dnf-sack.cpp:794 -+#: libdnf/dnf-sack.cpp:796 ++#: libdnf/dnf-sack.cpp:865 msgid "failed to auto-detect architecture" -msgstr "아키텍처 자동 검색에 실패했습니다." +msgstr "구조 자동 검색에 실패했습니다" -#: libdnf/dnf-sack.cpp:919 -+#: libdnf/dnf-sack.cpp:961 ++#: libdnf/dnf-sack.cpp:1030 #, c-format msgid "failed creating cachedir %s" - msgstr "캐시 된 생성 실패 %s" +-msgstr "캐시 된 생성 실패 %s" ++msgstr "캐쉬 된 생성 실패 %s" -#: libdnf/dnf-sack.cpp:1696 -+#: libdnf/dnf-sack.cpp:1738 ++#: libdnf/dnf-sack.cpp:1807 msgid "failed loading RPMDB" msgstr "RPMDB로드 실패" -#: libdnf/dnf-sack.cpp:2403 -+#: libdnf/dnf-sack.cpp:2463 ++#: libdnf/dnf-sack.cpp:2532 #, c-format msgid "No module defaults found: %s" -msgstr "" @@ -2599,7 +2835,7 @@ index 4809483..b3d0310 100644 #: libdnf/dnf-state.cpp:1184 #, c-format -@@ -285,7 +405,7 @@ msgstr "이미 100 %% 상태 [%s]" +@@ -285,7 +449,7 @@ msgstr "이미 100 %% 상태 [%s]" #: libdnf/dnf-transaction.cpp:300 #, c-format msgid "Sources not set when trying to ensure package %s" @@ -2608,7 +2844,7 @@ index 4809483..b3d0310 100644 #: libdnf/dnf-transaction.cpp:326 #, c-format -@@ -299,7 +419,7 @@ msgstr "신뢰할 수 없는지 확인하지 못했습니다. " +@@ -299,7 +463,7 @@ msgstr "신뢰할 수 없는지 확인하지 못했습니다. " #: libdnf/dnf-transaction.cpp:377 #, c-format msgid "Downloaded file for %s not found" @@ -2617,7 +2853,7 @@ index 4809483..b3d0310 100644 #: libdnf/dnf-transaction.cpp:397 #, c-format -@@ -308,7 +428,7 @@ msgstr "꾸러미 %1$s 확인 및 복구 할 수 없습니다. %2$s GPG 사용 +@@ -308,7 +472,7 @@ msgstr "꾸러미 %1$s 확인 및 복구 할 수 없습니다. %2$s GPG 사용 #: libdnf/dnf-transaction.cpp:831 libdnf/dnf-transaction.cpp:903 msgid "Failed to get value for CacheDir" @@ -2626,7 +2862,7 @@ index 4809483..b3d0310 100644 #: libdnf/dnf-transaction.cpp:911 #, c-format -@@ -325,26 +445,26 @@ msgstr "에 대한 파일 시스템 크기를 가져 오는 데 실패했습니 +@@ -325,26 +489,26 @@ msgstr "에 대한 파일 시스템 크기를 가져 오는 데 실패했습니 msgid "Not enough free space in %1$s: needed %2$s, available %3$s" msgstr "여유 공간이 부족합니다. %1$s: 필요 %2$s, 이용 가능 %3$s" @@ -2658,11 +2894,11 @@ index 4809483..b3d0310 100644 +msgstr "연결이 쓰기 단계로 이동하지 않았지만 오류를 반환하지 않았습니다 (%i)" -#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:399 -+#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:403 ++#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:485 #, c-format msgid "cannot open directory %1$s: %2$s" msgstr "디렉토리를 열 수 없습니다. %1$s: %2$s" -@@ -354,369 +474,416 @@ msgstr "디렉토리를 열 수 없습니다. %1$s: %2$s" +@@ -354,369 +518,421 @@ msgstr "디렉토리를 열 수 없습니다. %1$s: %2$s" msgid "failed to remove %s" msgstr "제거하지 못했습니다. %s" @@ -2994,28 +3230,33 @@ index 4809483..b3d0310 100644 +msgstr "이 작업으로 인해 다음과 같은 보호 꾸러미가 제거됩니다. " -#: libdnf/hy-iutil.cpp:322 -+#: libdnf/hy-iutil.cpp:326 ++#: libdnf/hy-iutil.cpp:181 ++#, c-format ++msgid "Libsolv's solv_toolversion is: %zu long but we expect max of: %zu" ++msgstr "Libsolv의 solv_toolversion은 %zu 길이지만 최대값은 %zu로 예상됩니다" ++ ++#: libdnf/hy-iutil.cpp:408 #, c-format msgid "Failed renaming %1$s to %2$s: %3$s" -msgstr "" +msgstr "%1$s 을 %2$s: %3$s에 이름 바꾸기 실패" -#: libdnf/hy-iutil.cpp:330 -+#: libdnf/hy-iutil.cpp:334 ++#: libdnf/hy-iutil.cpp:416 #, c-format msgid "Failed setting perms on %1$s: %2$s" -msgstr "" +msgstr "%1$s: %2$s에 perms 설정 실패하였습니다" -#: libdnf/hy-iutil.cpp:376 -+#: libdnf/hy-iutil.cpp:380 ++#: libdnf/hy-iutil.cpp:462 #, c-format msgid "cannot create directory %1$s: %2$s" -msgstr "" +msgstr "디렉토리를 생성 할 수 없습니다 %1$s: %2$s" -#: libdnf/hy-iutil.cpp:411 -+#: libdnf/hy-iutil.cpp:415 ++#: libdnf/hy-iutil.cpp:497 #, c-format msgid "cannot stat path %1$s: %2$s" -msgstr "" @@ -3076,8 +3317,7 @@ index 4809483..b3d0310 100644 +#: libdnf/module/ModulePackageContainer.cpp:841 +msgid "Installing module profiles:\n" +msgstr "모듈 프로파일 설치:\n" - --#: libdnf/module/ModulePackageContainer.cpp:1569 ++ +#: libdnf/module/ModulePackageContainer.cpp:856 +msgid "Disabling module profiles:\n" +msgstr "모듈 프로파일 비활성화:\n" @@ -3093,7 +3333,8 @@ index 4809483..b3d0310 100644 +#: libdnf/module/ModulePackageContainer.cpp:903 +msgid "Disabling modules:\n" +msgstr "모듈 비활성화:\n" -+ + +-#: libdnf/module/ModulePackageContainer.cpp:1569 +#: libdnf/module/ModulePackageContainer.cpp:914 +msgid "Resetting modules:\n" +msgstr "모듈 재설정:\n" @@ -3219,7 +3460,7 @@ index 4809483..b3d0310 100644 #: libdnf/repo/DependencySplitter.cpp:50 msgid "" -@@ -724,198 +891,220 @@ msgid "" +@@ -724,198 +940,220 @@ msgid "" "deprecated and the support will be dropped in future versions. Use '=' " "operator instead." msgstr "" @@ -3267,13 +3508,13 @@ index 4809483..b3d0310 100644 +#: libdnf/repo/Repo.cpp:548 +msgid "'proxy_username' is set but not 'proxy_password'" +msgstr "'proxy_username' 이 구성되어 있지만 'proxy_password'가 없습니다" -+ + +-#: libdnf/repo/Repo.cpp:633 libdnf/repo/Repo.cpp:655 +#: libdnf/repo/Repo.cpp:629 +#, c-format +msgid "Cannot find a valid baseurl for repo: %s" +msgstr "repo: %s 를 위해 유효한 baseurl을 찾을 수 없습니다" - --#: libdnf/repo/Repo.cpp:633 libdnf/repo/Repo.cpp:655 ++ +#: libdnf/repo/Repo.cpp:660 libdnf/repo/Repo.cpp:682 #, c-format msgid "%s: gpgme_data_new_from_fd(): %s" @@ -3383,7 +3624,8 @@ index 4809483..b3d0310 100644 +#: libdnf/repo/Repo.cpp:1298 #, c-format msgid "Cannot rename directory \"%s\" to \"%s\": %s" - msgstr "디렉터리 이름을 바꿀 수 없습니다 \"%s\"~\"%s\": %s" +-msgstr "디렉터리 이름을 바꿀 수 없습니다 \"%s\"~\"%s\": %s" ++msgstr "디렉토리 \"%s\"를 \"%s\": %s로 변경 할 수 없음" -#: libdnf/repo/Repo.cpp:1290 +#: libdnf/repo/Repo.cpp:1321 @@ -3472,12 +3714,14 @@ index 4809483..b3d0310 100644 -msgstr "진행중인 트랜잭션 없음" +msgstr "진행 중인 연결 없음" - #: libdnf/transaction/TransactionItem.cpp:147 +-#: libdnf/transaction/TransactionItem.cpp:147 ++#: libdnf/transaction/TransactionItem.cpp:146 msgid "Attempt to insert transaction item into completed transaction" -msgstr "트랜잭션 항목을 완료된 트랜잭션에 삽입하려고 시도했습니다." +msgstr "연결 항목을 완료된 연결에 삽입하려고 시도했습니다" - #: libdnf/transaction/TransactionItem.cpp:218 +-#: libdnf/transaction/TransactionItem.cpp:218 ++#: libdnf/transaction/TransactionItem.cpp:217 msgid "Attempt to update transaction item in completed transaction" -msgstr "완료된 트랜잭션에서 트랜잭션 항목 업데이트를 시도합니다." +msgstr "완료된 연결에서 연결 항목 최신화를 시도합니다" @@ -3504,17 +3748,31 @@ index 4809483..b3d0310 100644 #: libdnf/transaction/private/Transaction.cpp:58 #, c-format -@@ -924,7 +1113,4 @@ msgstr "TransactionItem 상태가 설정되지 않았습니다. %s" +@@ -924,7 +1162,19 @@ msgstr "TransactionItem 상태가 설정되지 않았습니다. %s" #: libdnf/transaction/private/Transaction.cpp:243 msgid "Can't add console output to unsaved transaction" -msgstr "저장되지 않은 트랜잭션에 콘솔 출력을 추가 할 수 없습니다." -- ++msgstr "저장되지 않은 연결에 콘솔 출력을 추가 할 수 없습니다" ++ ++#~ msgid "failed to add solv" ++#~ msgstr "solv를 추가하지 못했습니다" ++ ++#~ msgid "write_main() failed writing data: %i" ++#~ msgstr "write_main() 실패한 쓰기 자료: %i" ++ ++#~ msgid "write_main() failed to re-load written solv file" ++#~ msgstr "write_main ()이 작성된 solv 파일을 다시 적재하지 못했습니다" ++ ++#~ msgid "write_ext(%1$d) has failed: %2$d" ++#~ msgstr "write_ext(%1$d) 실패하였습니다: %2$d" + -#~ msgid "failed calculating RPMDB checksum" -#~ msgstr "RPMDB 체크섬 계산 실패" -+msgstr "저장되지 않은 연결에 콘솔 출력을 추가 할 수 없습니다" ++#~ msgid "repo_add_repomdxml/rpmmd() has failed." ++#~ msgstr "repo_add_repomdxml/rpmmd() 실패하였습니다." diff --git a/po/libdnf.pot b/po/libdnf.pot -index e7c0edf..fdc8ceb 100644 +index e7c0edfc..f4810576 100644 --- a/po/libdnf.pot +++ b/po/libdnf.pot @@ -8,7 +8,7 @@ msgid "" @@ -3522,11 +3780,11 @@ index e7c0edf..fdc8ceb 100644 "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-05 09:18-0400\n" -+"POT-Creation-Date: 2022-02-28 11:03+0100\n" ++"POT-Creation-Date: 2022-08-30 14:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -@@ -37,17 +37,30 @@ msgstr "" +@@ -37,17 +37,34 @@ msgstr "" msgid "unknown unit '%s'" msgstr "" @@ -3550,6 +3808,10 @@ index e7c0edf..fdc8ceb 100644 msgstr "" -#: libdnf/conf/OptionBinds.cpp:76 ++#: libdnf/conf/ConfigRepo.cpp:182 ++msgid "only the value 'priority' is supported." ++msgstr "" ++ +#: libdnf/conf/OptionBinds.cpp:85 #, c-format msgid "Configuration: OptionBinding with id \"%s\" does not exist" @@ -3560,7 +3822,7 @@ index e7c0edf..fdc8ceb 100644 #, c-format msgid "Configuration: OptionBinding with id \"%s\" already exists" msgstr "" -@@ -58,15 +71,11 @@ msgid "invalid boolean value '%s'" +@@ -58,15 +75,11 @@ msgid "invalid boolean value '%s'" msgstr "" #: libdnf/conf/OptionEnum.cpp:72 libdnf/conf/OptionEnum.cpp:158 @@ -3577,7 +3839,7 @@ index e7c0edf..fdc8ceb 100644 #: libdnf/conf/OptionNumber.cpp:73 #, c-format msgid "given value [%d] should be less than allowed value [%d]." -@@ -92,27 +101,126 @@ msgstr "" +@@ -92,27 +105,126 @@ msgstr "" msgid "could not convert '%s' to seconds" msgstr "" @@ -3587,98 +3849,98 @@ index e7c0edf..fdc8ceb 100644 msgstr "" -#: libdnf/dnf-goal.cpp:68 -+#: libdnf/dnf-context.cpp:3170 libdnf/dnf-context.cpp:3179 ++#: libdnf/dnf-context.cpp:3176 libdnf/dnf-context.cpp:3185 +#, c-format +msgid "Cannot enable more streams from module '%s' at the same time" +msgstr "" + -+#: libdnf/dnf-context.cpp:3188 libdnf/dnf-context.cpp:3206 ++#: libdnf/dnf-context.cpp:3194 libdnf/dnf-context.cpp:3212 +#, c-format +msgid "" +"Cannot enable module '%1$s' stream '%2$s': State of module already modified" +msgstr "" + -+#: libdnf/dnf-context.cpp:3253 ++#: libdnf/dnf-context.cpp:3259 +#, c-format +msgid "Modular dependency problem with Defaults: %s" +msgstr "" + -+#: libdnf/dnf-context.cpp:3256 ++#: libdnf/dnf-context.cpp:3262 +#, c-format +msgid "Modular dependency problem: %s" +msgstr "" + -+#: libdnf/dnf-context.cpp:3290 libdnf/dnf-context.cpp:3314 -+#: libdnf/dnf-context.cpp:3325 libdnf/dnf-context.cpp:3364 -+#: libdnf/dnf-context.cpp:3380 libdnf/dnf-context.cpp:3412 -+#: libdnf/dnf-context.cpp:3456 libdnf/dnf-context.cpp:3466 ++#: libdnf/dnf-context.cpp:3296 libdnf/dnf-context.cpp:3320 ++#: libdnf/dnf-context.cpp:3331 libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3386 libdnf/dnf-context.cpp:3418 ++#: libdnf/dnf-context.cpp:3462 libdnf/dnf-context.cpp:3472 +#, c-format +msgid "Unable to resolve argument '%s'" +msgstr "" + -+#: libdnf/dnf-context.cpp:3297 ++#: libdnf/dnf-context.cpp:3303 +#, c-format +msgid "" +"Only module name is required. Ignoring unneeded information in argument: '%s'" +msgstr "" + -+#: libdnf/dnf-context.cpp:3311 ++#: libdnf/dnf-context.cpp:3317 +#, c-format +msgid "Cannot reset module '%s': State of module already modified" +msgstr "" + -+#: libdnf/dnf-context.cpp:3322 ++#: libdnf/dnf-context.cpp:3328 +#, c-format +msgid "Cannot disable module '%s': State of module already modified" +msgstr "" + -+#: libdnf/dnf-context.cpp:3353 libdnf/dnf-context.cpp:3445 -+#: libdnf/dnf-context.cpp:3558 ++#: libdnf/dnf-context.cpp:3359 libdnf/dnf-context.cpp:3451 ++#: libdnf/dnf-context.cpp:3564 +msgid "No modular data available" +msgstr "" + -+#: libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3376 +#, c-format +msgid "Ignoring unneeded information in argument: '%s'" +msgstr "" + -+#: libdnf/dnf-context.cpp:3408 ++#: libdnf/dnf-context.cpp:3414 +#, c-format +msgid "" +"Problem during enablement of dependency tree for module '%1$s' stream " +"'%2$s': %3$s" +msgstr "" + -+#: libdnf/dnf-context.cpp:3420 ++#: libdnf/dnf-context.cpp:3426 +msgid "Problems appeared for module enable request" +msgstr "" + +#. this really should never happen; unless the modular repodata is corrupted -+#: libdnf/dnf-context.cpp:3495 ++#: libdnf/dnf-context.cpp:3501 +#, c-format +msgid "Failed to parse module artifact NEVRA '%s'" +msgstr "" + -+#: libdnf/dnf-context.cpp:3529 ++#: libdnf/dnf-context.cpp:3535 +msgid "Problems appeared for module install request" +msgstr "" + -+#: libdnf/dnf-context.cpp:3589 ++#: libdnf/dnf-context.cpp:3595 +msgid "Problems appeared for module reset request" +msgstr "" + -+#: libdnf/dnf-context.cpp:3591 ++#: libdnf/dnf-context.cpp:3597 +msgid "Problems appeared for module disable request" +msgstr "" + -+#: libdnf/dnf-context.cpp:3627 ++#: libdnf/dnf-context.cpp:3633 +#, c-format +msgid "" +"The operation would result in switching of module '%s' stream '%s' to stream " +"'%s'" +msgstr "" + -+#: libdnf/dnf-context.cpp:3631 ++#: libdnf/dnf-context.cpp:3637 +msgid "" +"It is not possible to switch enabled streams of a module.\n" +"It is recommended to remove all installed content from the module, and reset " @@ -3709,113 +3971,156 @@ index e7c0edf..fdc8ceb 100644 #, c-format msgid " Problem: %s\n" msgstr "" -@@ -177,84 +285,84 @@ msgstr "" +@@ -177,84 +289,123 @@ msgstr "" msgid "could not add erase element %1$s(%2$i)" msgstr "" -#: libdnf/dnf-sack.cpp:381 --#, c-format ++#: libdnf/dnf-sack.cpp:252 ++msgid "repo_add_solv() has failed." ++msgstr "" ++ ++#: libdnf/dnf-sack.cpp:416 + #, c-format -msgid "no %1$s string for %2$s" -+#: libdnf/dnf-sack.cpp:395 -+msgid "failed to add solv" ++msgid "Loading extension cache %s (%d) failed: " msgstr "" -#: libdnf/dnf-sack.cpp:404 -msgid "failed to add solv" -+#: libdnf/dnf-sack.cpp:414 ++#: libdnf/dnf-sack.cpp:430 +#, c-format +msgid "no %1$s string for %2$s" msgstr "" -#: libdnf/dnf-sack.cpp:422 -+#: libdnf/dnf-sack.cpp:424 ++#: libdnf/dnf-sack.cpp:440 #, c-format msgid "failed to open: %s" msgstr "" -#: libdnf/dnf-sack.cpp:501 -+#: libdnf/dnf-sack.cpp:503 ++#: libdnf/dnf-sack.cpp:519 #, c-format msgid "cannot create temporary file: %s" msgstr "" -#: libdnf/dnf-sack.cpp:511 -+#: libdnf/dnf-sack.cpp:513 ++#: libdnf/dnf-sack.cpp:529 #, c-format msgid "failed opening tmp file: %s" msgstr "" -#: libdnf/dnf-sack.cpp:523 -+#: libdnf/dnf-sack.cpp:525 ++#: libdnf/dnf-sack.cpp:551 #, c-format - msgid "write_main() failed writing data: %i" +-msgid "write_main() failed writing data: %i" ++msgid "While writing primary cache %s repowriter write failed: %i, error: %s" msgstr "" -#: libdnf/dnf-sack.cpp:540 -+#: libdnf/dnf-sack.cpp:542 - msgid "write_main() failed to re-load written solv file" +-msgid "write_main() failed to re-load written solv file" ++#: libdnf/dnf-sack.cpp:561 ++#, c-format ++msgid "Failed closing tmp file %s: %s" ++msgstr "" ++ ++#: libdnf/dnf-sack.cpp:571 ++#, c-format ++msgid "Failed to use newly written primary cache: %s: " msgstr "" -#: libdnf/dnf-sack.cpp:605 -+#: libdnf/dnf-sack.cpp:607 ++#: libdnf/dnf-sack.cpp:577 ++#, c-format ++msgid "Failed to use newly written primary cache: %s" ++msgstr "" ++ ++#: libdnf/dnf-sack.cpp:627 #, c-format msgid "can not create temporary file %s" msgstr "" -#: libdnf/dnf-sack.cpp:623 -+#: libdnf/dnf-sack.cpp:625 ++#: libdnf/dnf-sack.cpp:667 ++#, c-format ++msgid "" ++"While writing extension cache %s (%d): repowriter write failed: %i, error: %s" ++msgstr "" ++ ++#: libdnf/dnf-sack.cpp:677 ++#, c-format ++msgid "While writing extension cache (%d): cannot close temporary file: %s" ++msgstr "" ++ ++#: libdnf/dnf-sack.cpp:693 #, c-format - msgid "write_ext(%1$d) has failed: %2$d" +-msgid "write_ext(%1$d) has failed: %2$d" ++msgid "Failed to use newly written extension cache: %s (%d): " msgstr "" -#: libdnf/dnf-sack.cpp:678 -+#: libdnf/dnf-sack.cpp:680 ++#: libdnf/dnf-sack.cpp:700 ++#, c-format ++msgid "Failed to use newly written extension cache: %s (%d)" ++msgstr "" ++ ++#: libdnf/dnf-sack.cpp:741 msgid "null repo md file" msgstr "" -#: libdnf/dnf-sack.cpp:687 -+#: libdnf/dnf-sack.cpp:689 ++#: libdnf/dnf-sack.cpp:750 #, c-format msgid "can not read file %1$s: %2$s" msgstr "" -#: libdnf/dnf-sack.cpp:701 -+#: libdnf/dnf-sack.cpp:703 - msgid "repo_add_solv() has failed." +-msgid "repo_add_solv() has failed." ++#: libdnf/dnf-sack.cpp:765 ++#, c-format ++msgid "While loading repository failed to use %s: " msgstr "" -#: libdnf/dnf-sack.cpp:714 -+#: libdnf/dnf-sack.cpp:716 ++#: libdnf/dnf-sack.cpp:776 msgid "loading of MD_TYPE_PRIMARY has failed." msgstr "" -#: libdnf/dnf-sack.cpp:727 -+#: libdnf/dnf-sack.cpp:729 - msgid "repo_add_repomdxml/rpmmd() has failed." +-msgid "repo_add_repomdxml/rpmmd() has failed." ++#: libdnf/dnf-sack.cpp:788 ++#, c-format ++msgid "Loading repomd has failed: %s" ++msgstr "" ++ ++#: libdnf/dnf-sack.cpp:799 ++#, c-format ++msgid "Loading primary has failed: %s" msgstr "" -#: libdnf/dnf-sack.cpp:794 -+#: libdnf/dnf-sack.cpp:796 ++#: libdnf/dnf-sack.cpp:865 msgid "failed to auto-detect architecture" msgstr "" -#: libdnf/dnf-sack.cpp:919 -+#: libdnf/dnf-sack.cpp:961 ++#: libdnf/dnf-sack.cpp:1030 #, c-format msgid "failed creating cachedir %s" msgstr "" -#: libdnf/dnf-sack.cpp:1696 -+#: libdnf/dnf-sack.cpp:1738 ++#: libdnf/dnf-sack.cpp:1807 msgid "failed loading RPMDB" msgstr "" -#: libdnf/dnf-sack.cpp:2403 -+#: libdnf/dnf-sack.cpp:2463 ++#: libdnf/dnf-sack.cpp:2532 #, c-format msgid "No module defaults found: %s" msgstr "" -@@ -326,26 +434,26 @@ msgstr "" +@@ -326,26 +477,26 @@ msgstr "" msgid "Not enough free space in %1$s: needed %2$s, available %3$s" msgstr "" @@ -3843,11 +4148,11 @@ index e7c0edf..fdc8ceb 100644 msgstr "" -#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:399 -+#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:403 ++#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:485 #, c-format msgid "cannot open directory %1$s: %2$s" msgstr "" -@@ -355,272 +463,281 @@ msgstr "" +@@ -355,272 +506,286 @@ msgstr "" msgid "failed to remove %s" msgstr "" @@ -4131,25 +4436,30 @@ index e7c0edf..fdc8ceb 100644 msgstr "" -#: libdnf/hy-iutil.cpp:322 -+#: libdnf/hy-iutil.cpp:326 ++#: libdnf/hy-iutil.cpp:181 ++#, c-format ++msgid "Libsolv's solv_toolversion is: %zu long but we expect max of: %zu" ++msgstr "" ++ ++#: libdnf/hy-iutil.cpp:408 #, c-format msgid "Failed renaming %1$s to %2$s: %3$s" msgstr "" -#: libdnf/hy-iutil.cpp:330 -+#: libdnf/hy-iutil.cpp:334 ++#: libdnf/hy-iutil.cpp:416 #, c-format msgid "Failed setting perms on %1$s: %2$s" msgstr "" -#: libdnf/hy-iutil.cpp:376 -+#: libdnf/hy-iutil.cpp:380 ++#: libdnf/hy-iutil.cpp:462 #, c-format msgid "cannot create directory %1$s: %2$s" msgstr "" -#: libdnf/hy-iutil.cpp:411 -+#: libdnf/hy-iutil.cpp:415 ++#: libdnf/hy-iutil.cpp:497 #, c-format msgid "cannot stat path %1$s: %2$s" msgstr "" @@ -4187,7 +4497,7 @@ index e7c0edf..fdc8ceb 100644 msgid "No valid Platform ID detected" msgstr "" -@@ -629,36 +746,67 @@ msgstr "" +@@ -629,36 +794,67 @@ msgstr "" msgid "Cannot enable multiple streams for module '%s'" msgstr "" @@ -4261,7 +4571,7 @@ index e7c0edf..fdc8ceb 100644 #: libdnf/module/modulemd/ModuleMetadata.cpp:86 #, c-format msgid "Failed to update from string: %s" -@@ -684,6 +832,11 @@ msgstr "" +@@ -684,6 +880,11 @@ msgstr "" msgid "Failed to upgrade streams: %s" msgstr "" @@ -4273,7 +4583,7 @@ index e7c0edf..fdc8ceb 100644 #: libdnf/plugin/plugin.cpp:46 #, c-format msgid "Can't load shared library \"%s\": %s" -@@ -736,146 +889,161 @@ msgstr "" +@@ -736,146 +937,161 @@ msgstr "" msgid "Repository '%s' has unsupported type: 'type=%s', skipping." msgstr "" @@ -4465,7 +4775,7 @@ index e7c0edf..fdc8ceb 100644 #, c-format msgid "Log handler with id %ld doesn't exist" msgstr "" -@@ -884,13 +1052,13 @@ msgstr "" +@@ -884,21 +1100,21 @@ msgstr "" msgid "In progress" msgstr "" @@ -4483,16 +4793,27 @@ index e7c0edf..fdc8ceb 100644 msgid "No transaction in progress" msgstr "" +-#: libdnf/transaction/TransactionItem.cpp:147 ++#: libdnf/transaction/TransactionItem.cpp:146 + msgid "Attempt to insert transaction item into completed transaction" + msgstr "" + +-#: libdnf/transaction/TransactionItem.cpp:218 ++#: libdnf/transaction/TransactionItem.cpp:217 + msgid "Attempt to update transaction item in completed transaction" + msgstr "" + diff --git a/po/zh_CN.po b/po/zh_CN.po -index 9583b07..bdd2694 100644 +index 9583b075..17fb2105 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -1,19 +1,21 @@ +@@ -1,19 +1,22 @@ -# Charles Lee , 2017. #zanata, 2020. -# Ludek Janda , 2018. #zanata +# Charles Lee , 2017. #zanata, 2020, 2021. +# Ludek Janda , 2018. #zanata, 2021. +# Sundeep Anand , 2021, 2022. ++# Transtats , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -4501,9 +4822,9 @@ index 9583b07..bdd2694 100644 -"PO-Revision-Date: 2020-07-09 13:27+0000\n" -"Last-Translator: Charles Lee \n" -"Language-Team: Chinese (Simplified) \n" -+"POT-Creation-Date: 2022-02-28 11:03+0100\n" -+"PO-Revision-Date: 2022-03-02 10:16+0000\n" -+"Last-Translator: Sundeep Anand \n" ++"POT-Creation-Date: 2022-08-30 14:26+0200\n" ++"PO-Revision-Date: 2022-09-06 07:19+0000\n" ++"Last-Translator: Transtats \n" +"Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" @@ -4512,11 +4833,11 @@ index 9583b07..bdd2694 100644 "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.1.1\n" -+"X-Generator: Weblate 4.11\n" ++"X-Generator: Weblate 4.14\n" #: libdnf/conf/ConfigMain.cpp:62 libdnf/conf/OptionSeconds.cpp:40 msgid "no value specified" -@@ -32,37 +34,46 @@ msgstr "无法把 '%s' 转换为字节" +@@ -32,37 +35,50 @@ msgstr "无法把 '%s' 转换为字节" #: libdnf/conf/ConfigMain.cpp:83 libdnf/conf/OptionSeconds.cpp:66 #, c-format msgid "unknown unit '%s'" @@ -4543,6 +4864,10 @@ index 9583b07..bdd2694 100644 msgstr "百分数 '%s' 超出范围" -#: libdnf/conf/OptionBinds.cpp:76 ++#: libdnf/conf/ConfigRepo.cpp:182 ++msgid "only the value 'priority' is supported." ++msgstr "只支持值 'priority'。" ++ +#: libdnf/conf/OptionBinds.cpp:85 #, c-format msgid "Configuration: OptionBinding with id \"%s\" does not exist" @@ -4576,7 +4901,7 @@ index 9583b07..bdd2694 100644 #: libdnf/conf/OptionNumber.cpp:73 #, c-format -@@ -89,26 +100,128 @@ msgstr "给定的路径 “%s” 不存在。" +@@ -89,26 +105,128 @@ msgstr "给定的路径 “%s” 不存在。" msgid "could not convert '%s' to seconds" msgstr "无法把 '%s' 转换为秒" @@ -4586,98 +4911,98 @@ index 9583b07..bdd2694 100644 msgstr "GetValue(): 值没有设置" -#: libdnf/dnf-goal.cpp:68 -+#: libdnf/dnf-context.cpp:3170 libdnf/dnf-context.cpp:3179 ++#: libdnf/dnf-context.cpp:3176 libdnf/dnf-context.cpp:3185 +#, c-format +msgid "Cannot enable more streams from module '%s' at the same time" +msgstr "无法同时从模块 '%s' 中启用更多流" + -+#: libdnf/dnf-context.cpp:3188 libdnf/dnf-context.cpp:3206 ++#: libdnf/dnf-context.cpp:3194 libdnf/dnf-context.cpp:3212 +#, c-format +msgid "" +"Cannot enable module '%1$s' stream '%2$s': State of module already modified" +msgstr "无法启用模块 '%1$s' 流 '%2$s'：已经修改的模块状态" + -+#: libdnf/dnf-context.cpp:3253 ++#: libdnf/dnf-context.cpp:3259 +#, c-format +msgid "Modular dependency problem with Defaults: %s" +msgstr "默认设置的模块依赖性问题：%s" + -+#: libdnf/dnf-context.cpp:3256 ++#: libdnf/dnf-context.cpp:3262 +#, c-format +msgid "Modular dependency problem: %s" +msgstr "模块依赖问题：%s" + -+#: libdnf/dnf-context.cpp:3290 libdnf/dnf-context.cpp:3314 -+#: libdnf/dnf-context.cpp:3325 libdnf/dnf-context.cpp:3364 -+#: libdnf/dnf-context.cpp:3380 libdnf/dnf-context.cpp:3412 -+#: libdnf/dnf-context.cpp:3456 libdnf/dnf-context.cpp:3466 ++#: libdnf/dnf-context.cpp:3296 libdnf/dnf-context.cpp:3320 ++#: libdnf/dnf-context.cpp:3331 libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3386 libdnf/dnf-context.cpp:3418 ++#: libdnf/dnf-context.cpp:3462 libdnf/dnf-context.cpp:3472 +#, c-format +msgid "Unable to resolve argument '%s'" +msgstr "无法解析参数 '%s'" + -+#: libdnf/dnf-context.cpp:3297 ++#: libdnf/dnf-context.cpp:3303 +#, c-format +msgid "" +"Only module name is required. Ignoring unneeded information in argument: '%s'" +msgstr "只需要模块名。忽略参数 '%s' 中的无用信息" + -+#: libdnf/dnf-context.cpp:3311 ++#: libdnf/dnf-context.cpp:3317 +#, c-format +msgid "Cannot reset module '%s': State of module already modified" +msgstr "无法重置模块 '%s':已修改的模块状态" + -+#: libdnf/dnf-context.cpp:3322 ++#: libdnf/dnf-context.cpp:3328 +#, c-format +msgid "Cannot disable module '%s': State of module already modified" +msgstr "无法禁用模块 '%s':已经修改的模块状态" + -+#: libdnf/dnf-context.cpp:3353 libdnf/dnf-context.cpp:3445 -+#: libdnf/dnf-context.cpp:3558 ++#: libdnf/dnf-context.cpp:3359 libdnf/dnf-context.cpp:3451 ++#: libdnf/dnf-context.cpp:3564 +msgid "No modular data available" +msgstr "没有可用的模块数据" + -+#: libdnf/dnf-context.cpp:3370 ++#: libdnf/dnf-context.cpp:3376 +#, c-format +msgid "Ignoring unneeded information in argument: '%s'" -+msgstr "忽略参数：\"%s\" 中不需要的信息" ++msgstr "忽略参数中不需要的信息：'%s'" + -+#: libdnf/dnf-context.cpp:3408 ++#: libdnf/dnf-context.cpp:3414 +#, c-format +msgid "" +"Problem during enablement of dependency tree for module '%1$s' stream " +"'%2$s': %3$s" +msgstr "为模块 '%1$s' 流 '%2$s' 启用依赖树时出现问题: %3$s" + -+#: libdnf/dnf-context.cpp:3420 ++#: libdnf/dnf-context.cpp:3426 +msgid "Problems appeared for module enable request" +msgstr "模块启用请求时出现问题" + +#. this really should never happen; unless the modular repodata is corrupted -+#: libdnf/dnf-context.cpp:3495 ++#: libdnf/dnf-context.cpp:3501 +#, c-format +msgid "Failed to parse module artifact NEVRA '%s'" +msgstr "无法解析模块工件 NEVRA '%s'" + -+#: libdnf/dnf-context.cpp:3529 ++#: libdnf/dnf-context.cpp:3535 +msgid "Problems appeared for module install request" +msgstr "模块安装请求出现问题" + -+#: libdnf/dnf-context.cpp:3589 ++#: libdnf/dnf-context.cpp:3595 +msgid "Problems appeared for module reset request" +msgstr "模块重置请求时出现问题" + -+#: libdnf/dnf-context.cpp:3591 ++#: libdnf/dnf-context.cpp:3597 +msgid "Problems appeared for module disable request" +msgstr "模块禁用请求时出现问题" + -+#: libdnf/dnf-context.cpp:3627 ++#: libdnf/dnf-context.cpp:3633 +#, c-format +msgid "" +"The operation would result in switching of module '%s' stream '%s' to stream " +"'%s'" +msgstr "这个操作会把模块 '%s' 从流 '%s' 切换到流 '%s'" + -+#: libdnf/dnf-context.cpp:3631 ++#: libdnf/dnf-context.cpp:3637 +msgid "" +"It is not possible to switch enabled streams of a module.\n" +"It is recommended to remove all installed content from the module, and reset " @@ -4711,7 +5036,7 @@ index 9583b07..bdd2694 100644 #, c-format msgid " Problem: %s\n" msgstr " 问题: %s\n" -@@ -118,7 +231,7 @@ msgstr " 问题: %s\n" +@@ -118,7 +236,7 @@ msgstr " 问题: %s\n" msgid "" "No available modular metadata for modular package '%s'; cannot be installed " "on the system" @@ -4720,111 +5045,161 @@ index 9583b07..bdd2694 100644 #: libdnf/dnf-rpmts.cpp:121 libdnf/dnf-rpmts.cpp:166 #, c-format -@@ -173,87 +286,87 @@ msgstr "无法找到软件包 %s" +@@ -173,87 +291,126 @@ msgstr "无法找到软件包 %s" msgid "could not add erase element %1$s(%2$i)" msgstr "无法添加删除元素 %1$s(%2$i)" -#: libdnf/dnf-sack.cpp:381 --#, c-format ++#: libdnf/dnf-sack.cpp:252 ++msgid "repo_add_solv() has failed." ++msgstr "repo_add_solv() 已失败。" ++ ++#: libdnf/dnf-sack.cpp:416 + #, c-format -msgid "no %1$s string for %2$s" -msgstr "" -- --#: libdnf/dnf-sack.cpp:404 -+#: libdnf/dnf-sack.cpp:395 - msgid "failed to add solv" - msgstr "添加 solv 失败" ++msgid "Loading extension cache %s (%d) failed: " ++msgstr "加载扩展缓存 %s (%d) 失败： " --#: libdnf/dnf-sack.cpp:422 -+#: libdnf/dnf-sack.cpp:414 +-#: libdnf/dnf-sack.cpp:404 +-msgid "failed to add solv" +-msgstr "添加 solv 失败" ++#: libdnf/dnf-sack.cpp:430 +#, c-format +msgid "no %1$s string for %2$s" -+msgstr "没有为 %2$s 的 %1$s 字符串" -+ -+#: libdnf/dnf-sack.cpp:424 ++msgstr "没有 %2$s 的 %1$s 字符串" + +-#: libdnf/dnf-sack.cpp:422 ++#: libdnf/dnf-sack.cpp:440 #, c-format msgid "failed to open: %s" msgstr "打开失败：%s" -#: libdnf/dnf-sack.cpp:501 -+#: libdnf/dnf-sack.cpp:503 ++#: libdnf/dnf-sack.cpp:519 #, c-format msgid "cannot create temporary file: %s" msgstr "不能创建临时文件: %s" -#: libdnf/dnf-sack.cpp:511 -+#: libdnf/dnf-sack.cpp:513 ++#: libdnf/dnf-sack.cpp:529 #, c-format msgid "failed opening tmp file: %s" msgstr "打开 tmp 文件失败: %s" -#: libdnf/dnf-sack.cpp:523 -+#: libdnf/dnf-sack.cpp:525 ++#: libdnf/dnf-sack.cpp:551 ++#, c-format ++msgid "While writing primary cache %s repowriter write failed: %i, error: %s" ++msgstr "写主缓存 %s 时 repowriter 写失败：%i 错误：%s" ++ ++#: libdnf/dnf-sack.cpp:561 ++#, c-format ++msgid "Failed closing tmp file %s: %s" ++msgstr "关闭临时文件 %s 失败：%s" ++ ++#: libdnf/dnf-sack.cpp:571 #, c-format - msgid "write_main() failed writing data: %i" - msgstr "write_main() 写数据失败: %i" +-msgid "write_main() failed writing data: %i" +-msgstr "write_main() 写数据失败: %i" ++msgid "Failed to use newly written primary cache: %s: " ++msgstr "使用新写的主缓存失败：%s: " -#: libdnf/dnf-sack.cpp:540 -+#: libdnf/dnf-sack.cpp:542 - msgid "write_main() failed to re-load written solv file" - msgstr "write_main() 重新加载写的 solv 文件失败" +-msgid "write_main() failed to re-load written solv file" +-msgstr "write_main() 重新加载写的 solv 文件失败" ++#: libdnf/dnf-sack.cpp:577 ++#, c-format ++msgid "Failed to use newly written primary cache: %s" ++msgstr "使用新写的主缓存失败：%s" -#: libdnf/dnf-sack.cpp:605 -+#: libdnf/dnf-sack.cpp:607 ++#: libdnf/dnf-sack.cpp:627 #, c-format msgid "can not create temporary file %s" msgstr "不能创建临时文件 %s" -#: libdnf/dnf-sack.cpp:623 -+#: libdnf/dnf-sack.cpp:625 ++#: libdnf/dnf-sack.cpp:667 ++#, c-format ++msgid "" ++"While writing extension cache %s (%d): repowriter write failed: %i, error: %s" ++msgstr "编写扩展缓存 %s (%d) 时: repowriter 写失败： %i，错误： %s" ++ ++#: libdnf/dnf-sack.cpp:677 ++#, c-format ++msgid "While writing extension cache (%d): cannot close temporary file: %s" ++msgstr "编写扩展缓存 (%d) 时：无法关闭临时文件：%s" ++ ++#: libdnf/dnf-sack.cpp:693 #, c-format - msgid "write_ext(%1$d) has failed: %2$d" - msgstr "write_ext(%1$d) 已失败: %2$d" +-msgid "write_ext(%1$d) has failed: %2$d" +-msgstr "write_ext(%1$d) 已失败: %2$d" ++msgid "Failed to use newly written extension cache: %s (%d): " ++msgstr "使用新写的扩展缓存失败：%s (%d): " -#: libdnf/dnf-sack.cpp:678 -+#: libdnf/dnf-sack.cpp:680 ++#: libdnf/dnf-sack.cpp:700 ++#, c-format ++msgid "Failed to use newly written extension cache: %s (%d)" ++msgstr "使用新写的扩展缓存失败：%s (%d)" ++ ++#: libdnf/dnf-sack.cpp:741 msgid "null repo md file" - msgstr "null repo md 文件" +-msgstr "null repo md 文件" ++msgstr "null 存储库 md 文件" -#: libdnf/dnf-sack.cpp:687 -+#: libdnf/dnf-sack.cpp:689 ++#: libdnf/dnf-sack.cpp:750 #, c-format msgid "can not read file %1$s: %2$s" msgstr "不能读文件 %1$s: %2$s" -#: libdnf/dnf-sack.cpp:701 -+#: libdnf/dnf-sack.cpp:703 - msgid "repo_add_solv() has failed." - msgstr "repo_add_solv() 已失败。" +-msgid "repo_add_solv() has failed." +-msgstr "repo_add_solv() 已失败。" ++#: libdnf/dnf-sack.cpp:765 ++#, c-format ++msgid "While loading repository failed to use %s: " ++msgstr "加载软件仓库时使用 %s 失败： " -#: libdnf/dnf-sack.cpp:714 -+#: libdnf/dnf-sack.cpp:716 ++#: libdnf/dnf-sack.cpp:776 msgid "loading of MD_TYPE_PRIMARY has failed." -msgstr "" +msgstr "加载 MD_TYPE_PRIMARY 失败。" -#: libdnf/dnf-sack.cpp:727 -+#: libdnf/dnf-sack.cpp:729 - msgid "repo_add_repomdxml/rpmmd() has failed." - msgstr "repo_add_repomdxml/rpmmd() 已失败。" +-msgid "repo_add_repomdxml/rpmmd() has failed." +-msgstr "repo_add_repomdxml/rpmmd() 已失败。" ++#: libdnf/dnf-sack.cpp:788 ++#, c-format ++msgid "Loading repomd has failed: %s" ++msgstr "加载 repomd 失败：%s" ++ ++#: libdnf/dnf-sack.cpp:799 ++#, c-format ++msgid "Loading primary has failed: %s" ++msgstr "加载主设备失败：%s" -#: libdnf/dnf-sack.cpp:794 -+#: libdnf/dnf-sack.cpp:796 ++#: libdnf/dnf-sack.cpp:865 msgid "failed to auto-detect architecture" msgstr "自动检测架构失败" -#: libdnf/dnf-sack.cpp:919 -+#: libdnf/dnf-sack.cpp:961 ++#: libdnf/dnf-sack.cpp:1030 #, c-format msgid "failed creating cachedir %s" msgstr "无法创建 cachedir %s" -#: libdnf/dnf-sack.cpp:1696 -+#: libdnf/dnf-sack.cpp:1738 ++#: libdnf/dnf-sack.cpp:1807 msgid "failed loading RPMDB" msgstr "无法加载 RPMDB" -#: libdnf/dnf-sack.cpp:2403 -+#: libdnf/dnf-sack.cpp:2463 ++#: libdnf/dnf-sack.cpp:2532 #, c-format msgid "No module defaults found: %s" -msgstr "" @@ -4832,7 +5207,12 @@ index 9583b07..bdd2694 100644 #: libdnf/dnf-state.cpp:1184 #, c-format -@@ -291,7 +404,7 @@ msgstr "无法确保 %1$s，因为 repo %2$s 没有找到 (%3$i repos 已加载) +@@ -287,11 +444,11 @@ msgstr "在尝试确保软件包 %s 时源没有设置" + #: libdnf/dnf-transaction.cpp:326 + #, c-format + msgid "Failed to ensure %1$s as repo %2$s not found(%3$i repos loaded)" +-msgstr "无法确保 %1$s，因为 repo %2$s 没有找到 (%3$i repos 已加载)" ++msgstr "无法确保 %1$s，因为存储库 %2$s 没有找到 (%3$i 存储库已加载)" #: libdnf/dnf-transaction.cpp:367 msgid "Failed to check untrusted: " @@ -4841,7 +5221,16 @@ index 9583b07..bdd2694 100644 #: libdnf/dnf-transaction.cpp:377 #, c-format -@@ -310,7 +423,7 @@ msgstr "无法为 CacheDir 获得值" +@@ -301,7 +458,7 @@ msgstr "没有找到下载的文件 %s" + #: libdnf/dnf-transaction.cpp:397 + #, c-format + msgid "package %1$s cannot be verified and repo %2$s is GPG enabled: %3$s" +-msgstr "软件包 %1$s 不能被验证，repo %2$s 启用了 GPG: %3$s" ++msgstr "软件包 %1$s 不能被验证，存储库 %2$s 启用了 GPG: %3$s" + + #: libdnf/dnf-transaction.cpp:831 libdnf/dnf-transaction.cpp:903 + msgid "Failed to get value for CacheDir" +@@ -310,7 +467,7 @@ msgstr "无法为 CacheDir 获得值" #: libdnf/dnf-transaction.cpp:911 #, c-format msgid "Failed to get filesystem free size for %s: " @@ -4850,7 +5239,7 @@ index 9583b07..bdd2694 100644 #: libdnf/dnf-transaction.cpp:919 #, c-format -@@ -322,26 +435,26 @@ msgstr "无法为 %s 获得文件系统可用空间的大小" +@@ -322,26 +479,26 @@ msgstr "无法为 %s 获得文件系统可用空间的大小" msgid "Not enough free space in %1$s: needed %2$s, available %3$s" msgstr "%1$s 没有足够的空闲空间: 需要 %2$s，可用 %3$s" @@ -4880,11 +5269,11 @@ index 9583b07..bdd2694 100644 msgstr "事务没有进入写阶段，但没有返回错误(%i)" -#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:399 -+#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:403 ++#: libdnf/dnf-utils.cpp:111 libdnf/hy-iutil.cpp:485 #, c-format msgid "cannot open directory %1$s: %2$s" msgstr "无法打开目录 %1$s: %2$s" -@@ -351,369 +464,414 @@ msgstr "无法打开目录 %1$s: %2$s" +@@ -351,369 +508,419 @@ msgstr "无法打开目录 %1$s: %2$s" msgid "failed to remove %s" msgstr "无法删除 %s" @@ -4998,7 +5387,7 @@ index 9583b07..bdd2694 100644 #, c-format msgid "nothing provides %s needed by %s" -msgstr "" -+msgstr "没有东西可提供 %s（%s 需要）" ++msgstr "没有提供 %s 所需要的 %s" -#: libdnf/goal/Goal.cpp:83 +#: libdnf/goal/Goal.cpp:102 @@ -5019,21 +5408,21 @@ index 9583b07..bdd2694 100644 #, c-format msgid "package %s obsoletes %s provided by %s" -msgstr "" -+msgstr "软件包 %s 取代了 %s（由 %s 提供）" ++msgstr "软件包 %s 淘汰了 %s 提供的 %s" -#: libdnf/goal/Goal.cpp:86 +#: libdnf/goal/Goal.cpp:105 #, c-format msgid "installed package %s obsoletes %s provided by %s" -msgstr "" -+msgstr "已安装的软件包 %s 取代了 %s（由 %s 提供）" ++msgstr "已安装的软件包 %s 淘汰了 %s 提供的 %s" -#: libdnf/goal/Goal.cpp:87 +#: libdnf/goal/Goal.cpp:106 #, c-format msgid "package %s implicitly obsoletes %s provided by %s" -msgstr "" -+msgstr "软件包 %s 隐式地取代了 %s（由 %s 提供）" ++msgstr "软件包 %s 隐式地淘汰了 %s 提供的 %s" -#: libdnf/goal/Goal.cpp:88 +#: libdnf/goal/Goal.cpp:107 @@ -5101,49 +5490,49 @@ index 9583b07..bdd2694 100644 #, c-format msgid "nothing provides %s needed by module %s" -msgstr "" -+msgstr "没有东西提供 %s（模块 %s 需要它）" ++msgstr "没有提供模块 %s 所需要的 %s" -#: libdnf/goal/Goal.cpp:110 +#: libdnf/goal/Goal.cpp:129 #, c-format msgid "cannot install both modules %s and %s" -msgstr "" -+msgstr "无法同时安装模块 %s 和 %s" ++msgstr "不能同时安装模块 %s 和 %s" -#: libdnf/goal/Goal.cpp:111 +#: libdnf/goal/Goal.cpp:130 #, c-format msgid "module %s conflicts with %s provided by %s" -msgstr "" -+msgstr "模块 %s 与 %s （由 %s 提供）冲突" ++msgstr "模块 %s 与 %s 提供的 %s 冲突" -#: libdnf/goal/Goal.cpp:112 +#: libdnf/goal/Goal.cpp:131 #, c-format msgid "module %s obsoletes %s provided by %s" -msgstr "" -+msgstr "模块 %s 取代了 %s（由 %s 提供）" ++msgstr "模块 %s 淘汰了 %s 提供的 %s" -#: libdnf/goal/Goal.cpp:113 +#: libdnf/goal/Goal.cpp:132 #, c-format msgid "installed module %s obsoletes %s provided by %s" -msgstr "" -+msgstr "已安装的模块 %s 取代了 %s（由 %s 提供）" ++msgstr "已安装的模块 %s 淘汰了 %s 提供的 %s" -#: libdnf/goal/Goal.cpp:114 +#: libdnf/goal/Goal.cpp:133 #, c-format msgid "module %s implicitly obsoletes %s provided by %s" -msgstr "" -+msgstr "模块 %s 隐式地取代了 %s（由 %s 提供）" ++msgstr "模块 %s 隐式地淘汰了 %s 提供的 %s" -#: libdnf/goal/Goal.cpp:115 +#: libdnf/goal/Goal.cpp:134 #, c-format msgid "module %s requires %s, but none of the providers can be installed" -msgstr "" -+msgstr "模块 %s 需要 %s，但没有提供者可以被安装" ++msgstr "模块 %s 需要 %s，但无法安装任何提供程序" -#: libdnf/goal/Goal.cpp:116 +#: libdnf/goal/Goal.cpp:135 @@ -5208,26 +5597,31 @@ index 9583b07..bdd2694 100644 +msgstr "这个操作将会导致删除以下受保护的软件包: " -#: libdnf/hy-iutil.cpp:322 -+#: libdnf/hy-iutil.cpp:326 ++#: libdnf/hy-iutil.cpp:181 ++#, c-format ++msgid "Libsolv's solv_toolversion is: %zu long but we expect max of: %zu" ++msgstr "Libsolv 的 solv_toolversion 为： %zu，但我们预计最大为：%zu" ++ ++#: libdnf/hy-iutil.cpp:408 #, c-format msgid "Failed renaming %1$s to %2$s: %3$s" msgstr "将 %1$s 重命名为 %2$s 失败: %3$s" -#: libdnf/hy-iutil.cpp:330 -+#: libdnf/hy-iutil.cpp:334 ++#: libdnf/hy-iutil.cpp:416 #, c-format msgid "Failed setting perms on %1$s: %2$s" msgstr "在 %1$s 中设置 perms 失败: %2$s" -#: libdnf/hy-iutil.cpp:376 -+#: libdnf/hy-iutil.cpp:380 ++#: libdnf/hy-iutil.cpp:462 #, c-format msgid "cannot create directory %1$s: %2$s" -msgstr "" +msgstr "无法创建目录 %1$s: %2$s" -#: libdnf/hy-iutil.cpp:411 -+#: libdnf/hy-iutil.cpp:415 ++#: libdnf/hy-iutil.cpp:497 #, c-format msgid "cannot stat path %1$s: %2$s" -msgstr "" @@ -5283,7 +5677,7 @@ index 9583b07..bdd2694 100644 #, c-format msgid "Conflicting defaults with repo '%s': %s" -msgstr "" -+msgstr "默认设置与 repo '%s' 冲突 : %s" ++msgstr "默认设置与存储库 '%s' 冲突 : %s" + +#: libdnf/module/ModulePackageContainer.cpp:841 +msgid "Installing module profiles:\n" @@ -5296,7 +5690,8 @@ index 9583b07..bdd2694 100644 +#: libdnf/module/ModulePackageContainer.cpp:871 +msgid "Enabling module streams:\n" +msgstr "启用模块流：\n" -+ + +-#: libdnf/module/ModulePackageContainer.cpp:1569 +#: libdnf/module/ModulePackageContainer.cpp:885 +msgid "Switching module streams:\n" +msgstr "切换模块流：\n" @@ -5308,8 +5703,7 @@ index 9583b07..bdd2694 100644 +#: libdnf/module/ModulePackageContainer.cpp:914 +msgid "Resetting modules:\n" +msgstr "重置模块：\n" - --#: libdnf/module/ModulePackageContainer.cpp:1569 ++ +#: libdnf/module/ModulePackageContainer.cpp:1638 #, c-format msgid "Unable to load modular Fail-Safe data at '%s'" @@ -5342,7 +5736,7 @@ index 9583b07..bdd2694 100644 #, c-format msgid "Unable to remove a modular Fail Safe data in '%s'" -msgstr "" -+msgstr "无法删除 '%s' 处的模块 Fail Safe 数据" ++msgstr "无法删除 '%s' 中的模块 Fail Safe 数据" + +#: libdnf/module/ModulePackageContainer.cpp:1773 +#, c-format @@ -5430,7 +5824,7 @@ index 9583b07..bdd2694 100644 #: libdnf/repo/DependencySplitter.cpp:50 msgid "" -@@ -721,6 +879,8 @@ msgid "" +@@ -721,6 +928,8 @@ msgid "" "deprecated and the support will be dropped in future versions. Use '=' " "operator instead." msgstr "" @@ -5439,7 +5833,7 @@ index 9583b07..bdd2694 100644 #: libdnf/repo/Repo.cpp:321 #, c-format -@@ -732,146 +892,161 @@ msgstr "软件仓库 %s 没有设置镜像或者 baseurl。" +@@ -732,146 +941,161 @@ msgstr "软件仓库 %s 没有设置镜像或者 baseurl。" msgid "Repository '%s' has unsupported type: 'type=%s', skipping." msgstr "仓库 '%s' 有不被支持的类型: 'type=%s', 忽略。" @@ -5450,7 +5844,7 @@ index 9583b07..bdd2694 100644 -msgid "Cannot find a valid baseurl for repo: %s" -msgstr "无法为仓库 %s 找到一个有效的 baseurl" +msgid "repo '%s': 'basecachedir' is not set" -+msgstr "Repo '%s': 'basecachedir' 没有设置" ++msgstr "存储库 '%s': 'basecachedir' 没有设置" -#: libdnf/repo/Repo.cpp:583 libdnf/repo/Repo.cpp:1672 +#: libdnf/repo/Repo.cpp:512 @@ -5465,7 +5859,7 @@ index 9583b07..bdd2694 100644 +#: libdnf/repo/Repo.cpp:546 +#, c-format +msgid "repo '%s': 'proxy_username' is set but not 'proxy_password'" -+msgstr "Repo '%s': 'proxy_username' 已被设置，但没有设置 'proxy_password'" ++msgstr "存储库 '%s': 'proxy_username' 已被设置，但没有设置 'proxy_password'" + +#: libdnf/repo/Repo.cpp:548 +msgid "'proxy_username' is set but not 'proxy_password'" @@ -5474,7 +5868,7 @@ index 9583b07..bdd2694 100644 +#: libdnf/repo/Repo.cpp:629 +#, c-format +msgid "Cannot find a valid baseurl for repo: %s" -+msgstr "无法为仓库 %s 找到一个有效的 baseurl" ++msgstr "无法为存储库找到一个有效的 baseurl：%s" + +#: libdnf/repo/Repo.cpp:660 libdnf/repo/Repo.cpp:682 #, c-format @@ -5510,13 +5904,15 @@ index 9583b07..bdd2694 100644 +#: libdnf/repo/Repo.cpp:886 #, c-format msgid "repo %s: 0x%s already imported" - msgstr "repo %s: 0x%s 已被导入" +-msgstr "repo %s: 0x%s 已被导入" ++msgstr "存储库 %s: 0x%s 已被导入" -#: libdnf/repo/Repo.cpp:887 +#: libdnf/repo/Repo.cpp:914 #, c-format msgid "repo %s: imported key 0x%s." - msgstr "repo %s: 已导入密钥 0x%s。" +-msgstr "repo %s: 已导入密钥 0x%s。" ++msgstr "存储库 %s: 已导入密钥 0x%s。" -#: libdnf/repo/Repo.cpp:1131 +#: libdnf/repo/Repo.cpp:1162 @@ -5565,7 +5961,8 @@ index 9583b07..bdd2694 100644 +#: libdnf/repo/Repo.cpp:1261 #, c-format msgid "Cannot create repo temporary directory \"%s\": %s" - msgstr "无法创建 repo 临时目录 \"%s\": %s" +-msgstr "无法创建 repo 临时目录 \"%s\": %s" ++msgstr "无法创建存储库临时目录 \"%s\": %s" -#: libdnf/repo/Repo.cpp:1244 +#: libdnf/repo/Repo.cpp:1275 @@ -5583,19 +5980,22 @@ index 9583b07..bdd2694 100644 +#: libdnf/repo/Repo.cpp:1321 #, c-format msgid "repo: using cache for: %s" - msgstr "仓库： 正在为 %s 使用缓存" +-msgstr "仓库： 正在为 %s 使用缓存" ++msgstr "存储库：使用缓存用于：%s" -#: libdnf/repo/Repo.cpp:1302 +#: libdnf/repo/Repo.cpp:1333 #, c-format msgid "Cache-only enabled but no cache for '%s'" - msgstr "仅使用缓存已开启但没有 '%s' 的缓存" +-msgstr "仅使用缓存已开启但没有 '%s' 的缓存" ++msgstr "仅启用缓存，但没有 '%s' 的缓存" -#: libdnf/repo/Repo.cpp:1306 +#: libdnf/repo/Repo.cpp:1337 #, c-format msgid "repo: downloading from remote: %s" - msgstr "repo: 从远程下载: %s" +-msgstr "repo: 从远程下载: %s" ++msgstr "存储库: 从远程下载: %s" -#: libdnf/repo/Repo.cpp:1312 +#: libdnf/repo/Repo.cpp:1344 @@ -5638,7 +6038,7 @@ index 9583b07..bdd2694 100644 #, c-format msgid "Log handler with id %ld doesn't exist" msgstr "id 为 %ld 的日志处理器不存在" -@@ -880,13 +1055,13 @@ msgstr "id 为 %ld 的日志处理器不存在" +@@ -880,31 +1104,31 @@ msgstr "id 为 %ld 的日志处理器不存在" msgid "In progress" msgstr "进行中" @@ -5656,7 +6056,15 @@ index 9583b07..bdd2694 100644 msgid "No transaction in progress" msgstr "没有事务在进行中" -@@ -900,7 +1075,7 @@ msgstr "试图在已完成的事务中更新事务" +-#: libdnf/transaction/TransactionItem.cpp:147 ++#: libdnf/transaction/TransactionItem.cpp:146 + msgid "Attempt to insert transaction item into completed transaction" + msgstr "试图向已完成的事务中插入事务项" + +-#: libdnf/transaction/TransactionItem.cpp:218 ++#: libdnf/transaction/TransactionItem.cpp:217 + msgid "Attempt to update transaction item in completed transaction" + msgstr "试图在已完成的事务中更新事务" #: libdnf/transaction/Transformer.cpp:76 msgid "Database Corrupted: no row 'version' in table 'config'" @@ -5665,13 +6073,35 @@ index 9583b07..bdd2694 100644 #: libdnf/transaction/Transformer.cpp:681 msgid "Transformer: can't open history persist dir" -@@ -925,6 +1100,3 @@ msgstr "无法向未保存的事务中添加控制台输出" +-msgstr "Transformer: 无法打开 history persist dir" ++msgstr "转换程序: 无法打开历史持久目录" + #: libdnf/transaction/Transformer.cpp:694 + msgid "Couldn't find a history database" +@@ -923,8 +1147,20 @@ msgstr "TransactionItem 状态没有设置：%s" + msgid "Can't add console output to unsaved transaction" + msgstr "无法向未保存的事务中添加控制台输出" + ++#~ msgid "failed to add solv" ++#~ msgstr "添加 solv 失败" ++ ++#~ msgid "write_main() failed writing data: %i" ++#~ msgstr "write_main() 写数据失败: %i" ++ ++#~ msgid "write_main() failed to re-load written solv file" ++#~ msgstr "write_main() 重新加载写的 solv 文件失败" ++ ++#~ msgid "write_ext(%1$d) has failed: %2$d" ++#~ msgstr "write_ext(%1$d) 已失败: %2$d" ++ ++#~ msgid "repo_add_repomdxml/rpmmd() has failed." ++#~ msgstr "repo_add_repomdxml/rpmmd() 已失败。" ++ #~ msgid "Bad id for repo: %s, byte = %s %d" #~ msgstr "repo 的 id 无效: %s, byte = %s %d" - -#~ msgid "failed calculating RPMDB checksum" -#~ msgstr "无法计算 RPMDB checksum" -- -2.35.1 +2.37.3 diff --git a/SPECS/libdnf.spec b/SPECS/libdnf.spec index 795e8f2..96b9ebe 100644 --- a/SPECS/libdnf.spec +++ b/SPECS/libdnf.spec @@ -1,4 +1,4 @@ -%global libsolv_version 0.7.17 +%global libsolv_version 0.7.20-3 %global libmodulemd_version 2.11.2-2 %global librepo_version 1.13.1 %global dnf_conflict 4.3.0 @@ -56,7 +56,7 @@ Name: libdnf Version: %{libdnf_major_version}.%{libdnf_minor_version}.%{libdnf_micro_version} -Release: 8.2%{?dist} +Release: 11.1%{?dist} Summary: Library providing simplified C and Python API to libsolv License: LGPLv2+ URL: https://github.com/rpm-software-management/libdnf @@ -86,9 +86,23 @@ Patch22: 0022-hawkey-surrogateescape-error-handler-to-decode-UTF-8-string Patch23: 0023-Turn-off-strict-validation-of-modulemd-documents-RhBug200485320071662007167.patch Patch24: 0024-Add-unittest-for-setting-up-repo-with-empty-keyfile-RhBug1994614.patch Patch25: 0025-Add-getLatestModules.patch -Patch26: 0026-Update-translations-RhBug-2017272.patch -Patch27: 0027-advisory-upgrade-filter-out-advPkgs-with-different-a.patch -Patch28: 0028-Add-obsoletes-to-filtering-for-advisory-candidates.patch +Patch26: 0026-context-Substitute-all-repository-config-options-RhB.patch +Patch27: 0027-Use-environment-variable-in-unittest-instead-of-ugly.patch +Patch28: 0028-Add-private-API-for-filling-reading-and-verifying-ne.patch +Patch29: 0029-Use-dnf-solv-userdata-to-check-versions-and-checksum.patch +Patch30: 0030-Update-unittest-to-test-the-new-private-dnf-solvfile.patch +Patch31: 0031-Increase-required-libsolv-version-for-cache-versioni.patch +Patch32: 0032-Add-more-specific-error-handling-for-loading-repomd-.patch +Patch33: 0033-libdnf-transaction-RPMItem-Fix-handling-transaction-.patch +Patch34: 0034-libdnf-transaction-TransactionItem-Set-short-action-.patch +Patch35: 0035-Do-not-print-errors-on-failovermethod-repo-option-Rh.patch +Patch36: 0036-sack-query.hpp-Add-a-missing-include.patch +Patch37: 0037-context-dnf_context_remove-accepts-package-spec-as-d.patch +Patch38: 0038-context-Fix-doc-dnf_context_install-remove-update-di.patch +Patch39: 0039-advisory-upgrade-filter-out-advPkgs-with-different-a.patch +Patch40: 0040-Add-obsoletes-to-filtering-for-advisory-candidates.patch +Patch41: 0041-Update-translations-RHEL-8.7.patch + BuildRequires: cmake BuildRequires: gcc @@ -333,14 +347,22 @@ popd %endif %changelog -* Wed Aug 17 2022 Lukas Hrazky - 0.63.0-8.2 +* Wed Sep 14 2022 Marek Blaha - 0.63.0-11.1 +- Update translations + +* Thu Jul 21 2022 Lukas Hrazky - 0.63.0-11 - Add obsoletes to filtering for advisory candidates -* Wed Jun 15 2022 Lukas Hrazky - 0.63.0-8.1 +* Tue Jun 14 2022 Lukas Hrazky - 0.63.0-10 +- Do not print errors on failovermethod repo option +- the dnf_context_remove() function accepts ``, doc updates - advisory upgrade: filter out advPkgs with different arch -* Fri Mar 18 2022 Marek Blaha - 0.63.0-8 -- Update translations +* Wed May 04 2022 Lukas Hrazky - 0.63.0-8 +- Substitute all repository config options (fixes substitution of baseurl) +- Use solvfile userdata to store and check checksums and solv versions +- Fix handling transaction id in resolveTransactionItemReason +- Set short action for Reason Change * Fri Jan 14 2022 Pavla Kratochvilova - 0.63.0-7 - Rebuild with new release number