Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package barrel for openSUSE:Factory checked in at 2024-01-03 12:30:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/barrel (Old) and /work/SRC/openSUSE:Factory/.barrel.new.28375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "barrel" Wed Jan 3 12:30:38 2024 rev:20 rq:1136257 version:0.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/barrel/barrel.changes 2023-10-12 23:43:01.942902735 +0200 +++ /work/SRC/openSUSE:Factory/.barrel.new.28375/barrel.changes 2024-01-03 12:31:18.693337935 +0100 @@ -1,0 +2,6 @@ +Tue Jan 02 16:34:48 CET 2024 - aschn...@suse.com + +- speedup startup +- version 0.2.5 + +------------------------------------------------------------------- Old: ---- barrel-0.2.4.tar.xz New: ---- barrel-0.2.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ barrel.spec ++++++ --- /var/tmp/diff_new_pack.mHpDGx/_old 2024-01-03 12:31:19.333361342 +0100 +++ /var/tmp/diff_new_pack.mHpDGx/_new 2024-01-03 12:31:19.337361489 +0100 @@ -17,7 +17,7 @@ Name: barrel -Version: 0.2.4 +Version: 0.2.5 Release: 0 Summary: Tool for storage management License: GPL-2.0-only ++++++ barrel-0.2.4.tar.xz -> barrel-0.2.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.4/VERSION new/barrel-0.2.5/VERSION --- old/barrel-0.2.4/VERSION 2023-10-11 15:30:49.000000000 +0200 +++ new/barrel-0.2.5/VERSION 2024-01-02 15:56:47.000000000 +0100 @@ -1 +1 @@ -0.2.4 +0.2.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.4/barrel/Utils/Prompt.cc new/barrel-0.2.5/barrel/Utils/Prompt.cc --- old/barrel-0.2.4/barrel/Utils/Prompt.cc 2023-10-06 12:45:59.000000000 +0200 +++ new/barrel-0.2.5/barrel/Utils/Prompt.cc 2023-12-22 08:18:11.000000000 +0100 @@ -37,11 +37,11 @@ { while (true) { - // TRANSLATORS: Abbriviation for "yes". Translation must be different from + // TRANSLATORS: Abbreviation for "yes". Translation must be different from // translation for "n" ("no"). string y = _("y"); - // TRANSLATORS: Abbriviation for "no". Translation must be different from + // TRANSLATORS: Abbreviation for "no". Translation must be different from // translation for "y" ("yes"). string n = _("n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.4/barrel/handle.cc new/barrel-0.2.5/barrel/handle.cc --- old/barrel-0.2.4/barrel/handle.cc 2023-10-11 15:30:49.000000000 +0200 +++ new/barrel-0.2.5/barrel/handle.cc 2024-01-02 16:26:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2021-2023] SUSE LLC + * Copyright (c) [2021-2024] SUSE LLC * * All Rights Reserved. * @@ -33,6 +33,7 @@ #include <storage/Actions/Create.h> #include <storage/Actions/Delete.h> #include <storage/Version.h> +#include <storage/SystemInfo/SystemInfo.h> #include "Utils/GetOpts.h" #include "Utils/Args.h" @@ -338,30 +339,38 @@ void - startup(const GlobalOptions& global_options, Storage& storage) + startup(const GlobalOptions& global_options, unique_ptr<SystemInfo>& system_info, Storage& storage) { if (global_options.activate) { MyActivateCallbacks my_activate_callbacks(global_options); storage.activate(&my_activate_callbacks); +#if LIBSTORAGE_NG_VERSION_AT_LEAST(1, 96) + system_info = make_unique<SystemInfo>(); // used as reset +#endif } if (global_options.probe) { MyProbeCallbacks my_probe_callbacks(global_options); + +#if LIBSTORAGE_NG_VERSION_AT_LEAST(1, 96) + storage.probe(*system_info, &my_probe_callbacks); +#else storage.probe(&my_probe_callbacks); +#endif } } void - startup_pools(const GlobalOptions& global_options, State& state) + startup_pools(const GlobalOptions& global_options, unique_ptr<SystemInfo>& system_info, State& state) { if (!state.testsuite) { try { - CmdLoadPools::parse()->doit(global_options, state); + cmd_load_pools(global_options, *system_info, state); } catch (...) { @@ -458,8 +467,9 @@ environment.set_devicegraph_filename(testsuite->devicegraph_filename); unique_ptr<Storage> storage = make_unique<Storage>(environment); + unique_ptr<SystemInfo> system_info = make_unique<SystemInfo>(); - startup(global_options, *storage); + startup(global_options, system_info, *storage); Readline readline(storage.get(), testsuite); make_fixed_comp_names(); @@ -468,7 +478,7 @@ state.storage = storage.get(); state.testsuite = testsuite; - startup_pools(global_options, state); + startup_pools(global_options, system_info, state); // TODO readline completion with proper parsing, commands, options, pools, ... @@ -555,14 +565,15 @@ environment.set_devicegraph_filename(testsuite->devicegraph_filename); unique_ptr<Storage> storage = make_unique<Storage>(environment); + unique_ptr<SystemInfo> system_info = make_unique<SystemInfo>(); - startup(global_options, *storage); + startup(global_options, system_info, *storage); State state(global_options); state.storage = storage.get(); state.testsuite = testsuite; - startup_pools(global_options, state); + startup_pools(global_options, system_info, state); for (const shared_ptr<ParsedCmd>& parsed_cmd : cmds) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.4/barrel/load-pools.cc new/barrel-0.2.5/barrel/load-pools.cc --- old/barrel-0.2.4/barrel/load-pools.cc 2022-06-28 14:25:43.000000000 +0200 +++ new/barrel-0.2.5/barrel/load-pools.cc 2024-01-02 15:56:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 SUSE LLC + * Copyright (c) [2021-2024] SUSE LLC * * All Rights Reserved. * @@ -53,6 +53,15 @@ void ParsedCmdLoadPools::doit(const GlobalOptions& global_options, State& state) const { + SystemInfo system_info; + + cmd_load_pools(global_options, system_info, state); + } + + + void + cmd_load_pools(const GlobalOptions& global_options, SystemInfo& system_info, State& state) + { if (global_options.verbose) cout << _("Loading pools...") << endl; @@ -64,8 +73,6 @@ const Devicegraph* probed = storage->get_probed(); - SystemInfo system_info; - json_object_object_foreach(json.get_root(), k, j_pool) { Pool* pool = storage->create_pool(k); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.4/barrel/load-pools.h new/barrel-0.2.5/barrel/load-pools.h --- old/barrel-0.2.4/barrel/load-pools.h 2022-01-11 10:37:02.000000000 +0100 +++ new/barrel-0.2.5/barrel/load-pools.h 2024-01-02 15:56:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 SUSE LLC + * Copyright (c) [2021-2024] SUSE LLC * * All Rights Reserved. * @@ -38,6 +38,9 @@ virtual const char* help() const override; }; + + void cmd_load_pools(const GlobalOptions& global_options, SystemInfo& system_info, State& state); + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.4/doc/barrel.xml.in new/barrel-0.2.5/doc/barrel.xml.in --- old/barrel-0.2.4/doc/barrel.xml.in 2023-10-06 12:45:59.000000000 +0200 +++ new/barrel-0.2.5/doc/barrel.xml.in 2023-12-22 08:14:19.000000000 +0100 @@ -80,7 +80,7 @@ <para>The stack can hold different objects: storage objects (e.g. block devices, LVM volume groups or file systems), a - mark and arrays. Arrays are contructed using the [ and ] + mark and arrays. Arrays are constructed using the [ and ] commands.</para> </refsect2> @@ -200,14 +200,14 @@ <varlistentry> <term><option>[</option></term> <listitem> - <para>Starts an array contruction by pushing a mark on the stack.</para> + <para>Starts an array construction by pushing a mark on the stack.</para> </listitem> </varlistentry> <varlistentry> <term><option>]</option></term> <listitem> - <para>Ends an array contruction by creating a new array from + <para>Ends an array construction by creating a new array from the objects on the stack upto the next mark, removing the objects and the mark from the stack and finally pushing the new array onto the stack.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.4/po/cs.po new/barrel-0.2.5/po/cs.po --- old/barrel-0.2.4/po/cs.po 2023-10-11 14:38:45.000000000 +0200 +++ new/barrel-0.2.5/po/cs.po 2023-12-22 09:33:56.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-10-06 12:47+0200\n" -"PO-Revision-Date: 2023-10-10 22:15+0000\n" +"PO-Revision-Date: 2023-10-13 11:15+0000\n" "Last-Translator: AleÅ¡ Kastner <al...@volny.cz>\n" "Language-Team: Czech <https://l10n.opensuse.org/projects/barrel/master/cs/>\n" "Language: cs\n" @@ -939,87 +939,87 @@ msgstr "pro pÅÃkaz 'raid' je vyžadován argument size" msgid "size argument required for command 'vg'" -msgstr "" +msgstr "pro pÅÃkaz 'vg' je vyžadován argument size" msgid "size missing for command 'lv'" -msgstr "" +msgstr "pro pÅÃkaz 'lv' chybà velikost" msgid "size of stripes" -msgstr "" +msgstr "velikost proužků" msgid "spare devices not allowed for raid level" -msgstr "" +msgstr "pro úroveÅ raid nejsou povolena náhradnà zaÅÃzenÃ" msgid "stack empty" -msgstr "" +msgstr "zásobnÃk je prázdný" msgid "stack empty during dup" -msgstr "" +msgstr "prázdný zásobnÃk bÄhem duplikace" msgid "stack empty during pop" -msgstr "" +msgstr "pÅi vytahovánà (pop) je zásobnÃk prázdný" msgid "stackunderflow during exch" -msgstr "" +msgstr "podteÄenà (underflow) zásobnÃku pÅi výmÄnÄ" #. TRANSLATORS: error message, 'stat' refers to stat system call #, c-format msgid "stat for json file '%s' failed" -msgstr "" +msgstr "'stat' pro soubor json '%s' selhal" msgid "too few raid devices for raid level" -msgstr "" +msgstr "pro tuto úroveÅ raid je pÅÃliÅ¡ málo zaÅÃzenà raid" msgid "tune options" -msgstr "" +msgstr "možnosti ladÄnÃ" #, c-format msgid "tune options not allowed for %s" -msgstr "" +msgstr "možnosti ladÄnà nejsou pro %s povoleny" #, c-format msgid "unknown btrfs profile '%s'" -msgstr "" +msgstr "neznámý btrfs profil '%s'" msgid "unknown encryption type" -msgstr "" +msgstr "neznámý typ Å¡ifrovánÃ" #, c-format msgid "unknown filesystem type '%s'" -msgstr "" +msgstr "neznámý typ systému souborů '%s'" #, c-format msgid "unknown mount-by type type '%s'" -msgstr "" +msgstr "neznámý typ mount-by typ: '%s'" msgid "unknown partition table type" -msgstr "" +msgstr "neznámý typ tabulky oddÃlů" msgid "unknown raid level for command 'raid'" -msgstr "" +msgstr "neznámá úroveÅ raid pro pÅÃkaz 'raid'" #. TRANSLATORS: help text msgid "use probed instead of staging devicegraph" -msgstr "" +msgstr "mÃsto etapové mapy zaÅÃzenà použÃt probed" #, c-format msgid "value for '%s' neither string nor array" -msgstr "" +msgstr "hodnota '%s' nenà ÅetÄzec ani pole" msgid "value of description entry not a string" -msgstr "" +msgstr "hodnota položky popisu (description) nenà ÅetÄzec" msgid "value of devices entry not an array" -msgstr "" +msgstr "hodnota položky zaÅÃzenà (devices) nenà pole" #, c-format msgid "volume group '%s' is over-committed" -msgstr "" +msgstr "skupina svazků '%s' je nadmÄrnÄ obsazena" msgid "wrong number of partitionables" -msgstr "" +msgstr "Å¡patný poÄet dÄlitelných položek" #. TRANSLATORS: Abbriviation for "yes". Translation must be different from #. translation for "n" ("no"). msgid "y" -msgstr "" +msgstr "a"