Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package barrel for openSUSE:Factory checked in at 2023-06-16 16:55:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/barrel (Old) and /work/SRC/openSUSE:Factory/.barrel.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "barrel" Fri Jun 16 16:55:04 2023 rev:16 rq:1093333 version:0.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/barrel/barrel.changes 2023-03-15 18:54:45.800464989 +0100 +++ /work/SRC/openSUSE:Factory/.barrel.new.15902/barrel.changes 2023-06-16 16:56:15.302206816 +0200 @@ -1,0 +2,6 @@ +Wed May 31 11:47:15 CEST 2023 - [email protected] + +- handle unsupported partition ids during loading of devicegraph +- version 0.2.1 + +------------------------------------------------------------------- Old: ---- barrel-0.2.0.tar.xz New: ---- barrel-0.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ barrel.spec ++++++ --- /var/tmp/diff_new_pack.rgy3Mp/_old 2023-06-16 16:56:15.894210309 +0200 +++ /var/tmp/diff_new_pack.rgy3Mp/_new 2023-06-16 16:56:15.898210333 +0200 @@ -17,7 +17,7 @@ Name: barrel -Version: 0.2.0 +Version: 0.2.1 Release: 0 Summary: Tool for storage management License: GPL-2.0-only @@ -25,12 +25,12 @@ URL: https://github.com/openSUSE/barrel Source: barrel-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: libstorage-ng-devel >= 4.5.78 +BuildRequires: libstorage-ng-devel >= 4.5.101 BuildRequires: libtool BuildRequires: libxslt BuildRequires: readline-devel -Requires: libstorage-ng1 >= 4.5.78 +Requires: libstorage-ng1 >= 4.5.101 Recommends: %{name}-lang Recommends: logrotate %if 0%{?fedora_version} ++++++ barrel-0.2.0.tar.xz -> barrel-0.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/VERSION new/barrel-0.2.1/VERSION --- old/barrel-0.2.0/VERSION 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/VERSION 2023-05-31 12:14:44.000000000 +0200 @@ -1 +1 @@ -0.2.0 +0.2.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/Utils/Colors.cc new/barrel-0.2.1/barrel/Utils/Colors.cc --- old/barrel-0.2.0/barrel/Utils/Colors.cc 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/barrel/Utils/Colors.cc 2023-05-04 15:12:40.000000000 +0200 @@ -21,7 +21,7 @@ #include <unistd.h> -#include <string.h> +#include <cstring> #include "Colors.h" @@ -73,15 +73,19 @@ string -colorize_message(const string& s, bool green, bool red) +colorize_message(const string& s, Color color) { + switch (color) + { #if 0 - if (green) - return Colors::green(s); + case Color::GREEN: + return Colors::green(s); #endif - if (red) - return Colors::red(s); + case Color::RED: + return Colors::red(s); - return s; + default: + return s; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/Utils/Colors.h new/barrel-0.2.1/barrel/Utils/Colors.h --- old/barrel-0.2.0/barrel/Utils/Colors.h 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/barrel/Utils/Colors.h 2023-05-04 15:12:40.000000000 +0200 @@ -26,7 +26,11 @@ #include <string> +#include <storage/Actions/Base.h> + + using namespace std; +using namespace storage; class Colors @@ -44,7 +48,7 @@ string -colorize_message(const string& s, bool green, bool red); +colorize_message(const string& s, Color color); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/Utils/Table.h new/barrel-0.2.1/barrel/Utils/Table.h --- old/barrel-0.2.0/barrel/Utils/Table.h 2022-08-04 11:29:34.000000000 +0200 +++ new/barrel-0.2.1/barrel/Utils/Table.h 2023-03-27 11:43:04.000000000 +0200 @@ -38,7 +38,7 @@ enum class Id { NONE, NAME, SIZE, USAGE, POOL, USED, NUMBER, STRIPES, LABEL, MOUNT_POINT, PROFILES, - DESCRIPTION + DESCRIPTION, TRANSPORT }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/commit.cc new/barrel-0.2.1/barrel/commit.cc --- old/barrel-0.2.0/barrel/commit.cc 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/barrel/commit.cc 2023-05-04 15:12:40.000000000 +0200 @@ -51,10 +51,12 @@ { public: + MyCommitCallbacks(const Actiongraph* actiongraph) + : actiongraph(actiongraph) {} + void begin_action(const Action::Base* action) const override { - is_create = storage::is_create(action); - is_delete = storage::is_delete(action); + color = get_color(actiongraph, action); } void message(const string& message) const override; @@ -63,8 +65,9 @@ private: - mutable bool is_create = false; - mutable bool is_delete = false; + const Actiongraph* actiongraph; + + mutable Color color = Color::BLACK; }; @@ -72,7 +75,7 @@ void MyCommitCallbacks::message(const string& message) const { - cout << " " << colorize_message(message, is_create, is_delete) << '\n'; + cout << " " << colorize_message(message, color) << '\n'; } @@ -111,7 +114,7 @@ else { CommitOptions commit_options(false); - MyCommitCallbacks my_commit_callbacks; + MyCommitCallbacks my_commit_callbacks(actiongraph); state.storage->commit(commit_options, &my_commit_callbacks); if (state.pools_modified) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/create-filesystem.cc new/barrel-0.2.1/barrel/create-filesystem.cc --- old/barrel-0.2.0/barrel/create-filesystem.cc 2023-01-19 16:43:09.000000000 +0100 +++ new/barrel-0.2.1/barrel/create-filesystem.cc 2023-05-24 11:06:44.000000000 +0200 @@ -30,6 +30,7 @@ #include <storage/Devices/Partition.h> #include <storage/Filesystems/MountPoint.h> #include <storage/Filesystems/Btrfs.h> +#include <storage/SystemInfo/SystemInfo.h> #include "Utils/GetOpts.h" #include "Utils/Text.h" @@ -502,9 +503,15 @@ } else if (options.path) { + SystemInfo system_info; + const string& path = options.path.value(); - if (path == "/home") + if (path == "/") + id = get_linux_partition_id(LinuxPartitionIdCategory::ROOT, system_info); + else if (path == "/usr") + id = get_linux_partition_id(LinuxPartitionIdCategory::USR, system_info); + else if (path == "/home") id = ID_LINUX_HOME; else if (path == "/srv") id = ID_LINUX_SERVER_DATA; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/handle.cc new/barrel-0.2.1/barrel/handle.cc --- old/barrel-0.2.0/barrel/handle.cc 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/barrel/handle.cc 2023-05-04 15:12:40.000000000 +0200 @@ -405,7 +405,7 @@ for (const Action::Base* action : actiongraph.get_commit_actions()) { cout << " " << colorize_message(get_string(&actiongraph, action), - is_create(action), is_delete(action)) << '\n'; + get_color(&actiongraph, action)) << '\n'; } } catch (const Exception& e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/load-devicegraph.cc new/barrel-0.2.1/barrel/load-devicegraph.cc --- old/barrel-0.2.0/barrel/load-devicegraph.cc 2022-06-28 14:25:43.000000000 +0200 +++ new/barrel-0.2.1/barrel/load-devicegraph.cc 2023-05-31 12:14:44.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 SUSE LLC + * Copyright (c) [2021-2023] SUSE LLC * * All Rights Reserved. * @@ -23,6 +23,7 @@ #include <storage/Storage.h> #include <storage/Devicegraph.h> #include <storage/Devices/Disk.h> +#include <storage/Devices/Partition.h> #include <storage/Devices/Dasd.h> #include <storage/Devices/Multipath.h> #include <storage/Devices/DmRaid.h> @@ -500,6 +501,26 @@ copy_to_staging(staging, a, b); } + for (Partitionable* partitionable : Partitionable::get_all(staging)) + { + if (!partitionable->has_partition_table()) + continue; + + PartitionTable* partition_table = partitionable->get_partition_table(); + + for (Partition* partition : partition_table->get_partitions()) + { + unsigned int id = partition->get_id(); + + if (id == ID_UNKNOWN || !partition_table->is_partition_id_supported(id)) + { + cout << sformat(_("Setting id of partition %s from unsupported value to %s."), + partition->get_name().c_str(), get_partition_id_name(ID_LINUX).c_str()) << '\n'; + partition->set_id(ID_LINUX); + } + } + } + // TODO must anything dependent be update? libstorage-ng already takes are of some // stuff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/show-commit.cc new/barrel-0.2.1/barrel/show-commit.cc --- old/barrel-0.2.0/barrel/show-commit.cc 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/barrel/show-commit.cc 2023-05-04 15:12:40.000000000 +0200 @@ -58,7 +58,7 @@ for (const Action::Base* action : actiongraph->get_commit_actions()) { cout << " " << colorize_message(get_string(actiongraph, action), - is_create(action), is_delete(action)) << '\n'; + get_color(actiongraph, action)) << '\n'; } } catch (const Exception& e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/show-disks.cc new/barrel-0.2.1/barrel/show-disks.cc --- old/barrel-0.2.0/barrel/show-disks.cc 2022-02-23 16:03:30.000000000 +0100 +++ new/barrel-0.2.1/barrel/show-disks.cc 2023-03-27 11:58:26.000000000 +0200 @@ -101,12 +101,18 @@ sort(disks.begin(), disks.end(), Disk::compare_by_name); Table table({ Cell(_("Name"), Id::NAME), Cell(_("Size"), Id::SIZE, Align::RIGHT), - Cell(_("Block Size"), Align::RIGHT), Cell(_("Usage"), Id::USAGE), - Cell(_("Pool"), Id::POOL) }); + // TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB + Cell(_("Transport"), Id::TRANSPORT), + Cell(_("Block Size"), Align::RIGHT), + Cell(_("Usage"), Id::USAGE), Cell(_("Pool"), Id::POOL) }); + table.set_visibility(Id::TRANSPORT, Visibility::AUTO); for (const Disk* disk : disks) { + Transport transport = disk->get_transport(); + Table::Row row(table, { disk->get_name(), format_size(disk->get_size()), + transport != Transport::UNKNOWN ? get_transport_name(disk->get_transport()) : "", format_size(disk->get_region().get_block_size(), true), device_usage(disk), device_pools(storage, disk) }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/show-pools.cc new/barrel-0.2.1/barrel/show-pools.cc --- old/barrel-0.2.0/barrel/show-pools.cc 2022-01-11 10:37:02.000000000 +0100 +++ new/barrel-0.2.1/barrel/show-pools.cc 2023-06-15 12:57:28.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 SUSE LLC + * Copyright (c) [2021-2023] SUSE LLC * * All Rights Reserved. * @@ -38,77 +38,116 @@ using namespace storage; + namespace + { + + const ExtOptions show_pools_options({ + // TRANSLATORS: help text + { "probed", no_argument, 0, _("use probed instead of staging devicegraph") } + }); + + + struct Options + { + Options(GetOpts& get_opts); + + bool show_probed = false; + }; + + + Options::Options(GetOpts& get_opts) + { + ParsedOpts parsed_opts = get_opts.parse("pools", show_pools_options); + + show_probed = parsed_opts.has_option("probed"); + } + + } + + class ParsedCmdShowPools : public ParsedCmd { public: + ParsedCmdShowPools(const Options& options) : options(options) {} + virtual bool do_backup() const override { return false; } virtual void doit(const GlobalOptions& global_options, State& state) const override; + private: + + const Options options; + }; void ParsedCmdShowPools::doit(const GlobalOptions& global_options, State& state) const { - const Devicegraph* staging = state.storage->get_staging(); + const Storage* storage = state.storage; + + const Devicegraph* devicegraph = options.show_probed ? storage->get_probed() : storage->get_staging(); Table table({ Cell(_("Name"), Id::NAME), Cell(_("Devices"), Id::NUMBER, Align::RIGHT), Cell(_("Size"), Id::SIZE, Align::RIGHT), Cell(_("Used"), Id::USED, Align::RIGHT) }); - map<string, Pool*> pools = state.storage->get_pools(); - for (const map<string, Pool*>::value_type& value : pools) + map<string, const Pool*> pools = storage->get_pools(); + for (const map<string, const Pool*>::value_type& value : pools) { const Pool* pool = value.second; Table::Row row(table, { value.first }); - vector<const Device*> devices = pool->get_devices(staging); + vector<const Device*> devices = pool->get_devices(devicegraph); sort(devices.begin(), devices.end(), Device::compare_by_name); - unsigned int number = 0; unsigned long long total_size = 0; unsigned long long total_used = 0; for (const Device* device : devices) { - if (!is_partitionable(device)) - continue; - - const Partitionable* partitionable = to_partitionable(device); - if (!partitionable->has_partition_table()) - continue; - - ++number; - Table::Row subrow(row.get_table()); - subrow[Id::NAME] = partitionable->get_name(); + subrow[Id::NAME] = device->get_displayname(); - const PartitionTable* partition_table = partitionable->get_partition_table(); + bool usable = false; - // TODO better sum of all slots? - unsigned long long size = partitionable->get_size(); - unsigned long long used = 0; - - for (const Partition* partition : partition_table->get_partitions()) + if (is_partitionable(device)) { - PartitionType partition_type = partition->get_type(); - - if (partition_type == PartitionType::PRIMARY || partition_type == PartitionType::LOGICAL) - used += partition->get_size(); + const Partitionable* partitionable = to_partitionable(device); + if (partitionable->has_partition_table()) + { + usable = true; + + const PartitionTable* partition_table = partitionable->get_partition_table(); + + // TODO better sum of all slots? + unsigned long long size = partitionable->get_size(); + unsigned long long used = 0; + + for (const Partition* partition : partition_table->get_partitions()) + { + PartitionType partition_type = partition->get_type(); + + if (partition_type == PartitionType::PRIMARY || partition_type == PartitionType::LOGICAL) + used += partition->get_size(); + } + + subrow[Id::SIZE] = format_size(size); + subrow[Id::USED] = format_percentage(used, size); + + total_size += size; + total_used += used; + } } - subrow[Id::SIZE] = format_size(size); - subrow[Id::USED] = format_percentage(used, size); - - total_size += size; - total_used += used; + if (!usable) + subrow[Id::NAME] += " !"; row.add_subrow(subrow); } - row[Id::NUMBER] = sformat("%u", number); + row[Id::NUMBER] = sformat("%zu", devices.size()); row[Id::SIZE] = format_size(total_size); row[Id::USED] = format_percentage(total_used, total_size); @@ -122,9 +161,9 @@ shared_ptr<ParsedCmd> CmdShowPools::parse(GetOpts& get_opts) const { - get_opts.parse("pools", GetOpts::no_ext_options); + Options options(get_opts); - return make_shared<ParsedCmdShowPools>(); + return make_shared<ParsedCmdShowPools>(options); } @@ -134,4 +173,11 @@ return _("Shows pools."); } + + const ExtOptions& + CmdShowPools::options() const + { + return show_pools_options; + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/show-pools.h new/barrel-0.2.1/barrel/show-pools.h --- old/barrel-0.2.0/barrel/show-pools.h 2022-01-11 10:37:02.000000000 +0100 +++ new/barrel-0.2.1/barrel/show-pools.h 2023-06-15 12:57:28.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 SUSE LLC + * Copyright (c) [2021-2023] SUSE LLC * * All Rights Reserved. * @@ -34,6 +34,7 @@ { virtual shared_ptr<ParsedCmd> parse(GetOpts& get_opts) const override; virtual const char* help() const override; + virtual const ExtOptions& options() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel/show.cc new/barrel-0.2.1/barrel/show.cc --- old/barrel-0.2.0/barrel/show.cc 2022-01-11 10:37:02.000000000 +0100 +++ new/barrel-0.2.1/barrel/show.cc 2023-06-15 12:57:28.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 SUSE LLC + * Copyright (c) [2021-2023] SUSE LLC * * All Rights Reserved. * @@ -126,13 +126,13 @@ { string ret; - const Devicegraph* probed = storage->get_probed(); + const Devicegraph* devicegraph = device->get_devicegraph(); map<string, const Pool*> pools = storage->get_pools(); for (const map<string, const Pool*>::value_type& value : pools) { const Pool* pool = value.second; - vector<const Device*> devices = pool->get_devices(probed); + vector<const Device*> devices = pool->get_devices(devicegraph); for (const Device* tmp : devices) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/barrel.spec.in new/barrel-0.2.1/barrel.spec.in --- old/barrel-0.2.0/barrel.spec.in 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/barrel.spec.in 2023-05-04 15:12:40.000000000 +0200 @@ -25,12 +25,12 @@ URL: https://github.com/openSUSE/barrel Source: barrel-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: libstorage-ng-devel >= 4.5.78 +BuildRequires: libstorage-ng-devel >= 4.5.101 BuildRequires: libtool BuildRequires: libxslt BuildRequires: readline-devel -Requires: libstorage-ng1 >= 4.5.78 +Requires: libstorage-ng1 >= 4.5.101 Recommends: %{name}-lang Recommends: logrotate %if 0%{?fedora_version} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/doc/barrel.xml.in new/barrel-0.2.1/doc/barrel.xml.in --- old/barrel-0.2.0/doc/barrel.xml.in 2023-03-13 07:59:47.000000000 +0100 +++ new/barrel-0.2.1/doc/barrel.xml.in 2023-06-15 12:57:28.000000000 +0200 @@ -1093,6 +1093,19 @@ <term><option>show pools</option></term> <listitem> <para>Shows pools.</para> + + <variablelist> + <varlistentry> + <term><option>--probed</option></term> + <listitem> + <para>Use the probed instead of the staging + devicegraph for finding devices of the pools.</para> + </listitem> + </varlistentry> + </variablelist> + + <para>Devices that are currently not usable since they do + not have a partition table are marked with an '!'.</para> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/ca.po new/barrel-0.2.1/po/ca.po --- old/barrel-0.2.0/po/ca.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/ca.po 2023-06-10 13:49:26.000000000 +0200 @@ -7,11 +7,11 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" -"PO-Revision-Date: 2023-01-20 13:14+0000\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" +"PO-Revision-Date: 2023-06-06 12:15+0000\n" "Last-Translator: David Medina <[email protected]>\n" -"Language-Team: Catalan <https://l10n.opensuse.org/projects/barrel/master/ca/"; -">\n" +"Language-Team: Catalan <https://l10n.opensuse.org/projects/barrel/master/ca/>" +"\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -325,6 +325,10 @@ msgid "Saving pools..." msgstr "Desant agrupacions..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "Es configura l'identificador de la partició %s del valor no admès a %s." + msgid "Shows DASDs." msgstr "Mostra DASDs." @@ -370,6 +374,10 @@ msgid "The command has the following subcommands:" msgstr "L'ordre té les subordres següents:" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "Transport" + msgid "Type" msgstr "Tipus" @@ -469,9 +477,8 @@ msgid "do not commit anything to disk" msgstr "no apliquis res al disc" -#, fuzzy msgid "do not show colors" -msgstr "no mostris particions als DASD" +msgstr "no mostris els colors" msgid "do not show partitions on DASDs" msgstr "no mostris particions als DASD" @@ -914,7 +921,7 @@ msgstr "s'han trobat diversos multicamins de mapatge per a %s" msgid "show colors" -msgstr "" +msgstr "mostra els colors" msgid "show help and exit" msgstr "mostra l'ajuda i surt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/cs.po new/barrel-0.2.1/po/cs.po --- old/barrel-0.2.0/po/cs.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/cs.po 2023-06-10 13:49:26.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" -"PO-Revision-Date: 2023-01-26 17:14+0000\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" +"PO-Revision-Date: 2023-06-02 22:15+0000\n" "Last-Translator: AleÅ¡ Kastner <[email protected]>\n" "Language-Team: Czech <https://l10n.opensuse.org/projects/barrel/master/cs/>\n" "Language: cs\n" @@ -282,7 +282,6 @@ msgid "Quit?" msgstr "UkonÄit?" -#, fuzzy msgid "Quits barrel." msgstr "UkonÄà barrel." @@ -328,6 +327,10 @@ msgid "Saving pools..." msgstr "Ukládám zásobárny..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "Nastavit ID oddÃlu %s z nepodporované hodnoty na %s." + msgid "Shows DASDs." msgstr "Ukáže DASDy." @@ -337,137 +340,147 @@ msgid "Shows RAIDs." msgstr "Ukáže RAIDy." +#, fuzzy msgid "Shows actiongraph." -msgstr "" +msgstr "Ukáže graf akce." +#, fuzzy msgid "Shows commit actions." -msgstr "" +msgstr "Ukáže potvrzené akce." msgid "Shows device tree." -msgstr "" +msgstr "Ukáže strom zaÅÃzenÃ." +#, fuzzy msgid "Shows devicegraph." -msgstr "" +msgstr "Ukáže devicegraf." msgid "Shows disks." -msgstr "" +msgstr "Ukáže disky." msgid "Shows encryption devices." -msgstr "" +msgstr "Ukáže Å¡ifrovacà zaÅÃzenÃ." msgid "Shows filesystems." -msgstr "" +msgstr "Ukáže systémy souborů." +#, fuzzy msgid "Shows multipath devices." -msgstr "" +msgstr "Ukáže vÃcecestná zaÅÃzenÃ." msgid "Shows pools." -msgstr "" +msgstr "Ukáže zásobárny." msgid "Size" -msgstr "" +msgstr "Velikost" +#, fuzzy msgid "Stripes" -msgstr "" +msgstr "Proužky" msgid "The command has the following subcommands:" -msgstr "" +msgstr "PÅÃkaz má následujÃcà dÃlÄà pÅÃkazy:" + +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +#, fuzzy +msgid "Transport" +msgstr "Transport" msgid "Type" -msgstr "" +msgstr "Typ" #, c-format msgid "Unknown global option '%s'." -msgstr "" +msgstr "Neznámá globálnà volba '%s'." #, c-format msgid "Unknown option '%s' for command '%s'." -msgstr "" +msgstr "Neznámá volba %s pÅÃkazu %s." msgid "Usage" -msgstr "" +msgstr "PoužitÃ" msgid "Used" -msgstr "" +msgstr "Použito" msgid "Vendor" -msgstr "" +msgstr "ObchodnÃk" msgid "Verify password:" -msgstr "" +msgstr "OvÄÅit heslo:" msgid "[ pushes a mark on the stack." -msgstr "" +msgstr "[ vložà znaÄku do zásobnÃku." msgid "] constructs an array." -msgstr "" +msgstr "] vytvoÅà pole." msgid "activate storage systems at startup" -msgstr "" +msgstr "pÅi startu aktivovat pamÄÅ¥ové systémy" msgid "answer all questions with yes" -msgstr "" +msgstr "na vÅ¡echny otázky odpovÄdÄt 'yes' (ano)" #, c-format msgid "array with %d object" msgid_plural "array with %d objects" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "pole s %d objektem" +msgstr[1] "pole s %d objekty" +msgstr[2] "pole s %d objekty" #. TRANSLATORS: error message, the argument for the command line option #. 'devices' is bad msgid "bad devices argument" -msgstr "" +msgstr "chybný argument 'devices'" msgid "bad stripes argument" -msgstr "" +msgstr "chybný argument 'stripes'" msgid "be more verbose" -msgstr "" +msgstr "vÃce zpráv o průbÄhu" msgid "be quiet" -msgstr "" +msgstr "bez zpráv o průbÄhu" #, c-format msgid "block device '%s' cannot be removed" -msgstr "" +msgstr "blokové zaÅÃzenà %s nelze odstranit" #, c-format msgid "block device '%s' cannot be used as a regular block device" -msgstr "" +msgstr "blokové zaÅÃzenà %s nelze použÃt jako obvyklé blokové z." #, c-format msgid "block device '%s' is in use" -msgstr "" +msgstr "blokové zaÅÃzenà %s se použÃvá" msgid "block devices for LVM volume group missing" -msgstr "" +msgstr "chybà bloková zaÅÃzenà pro skupinu svazků LVM" msgid "block devices for RAID missing" -msgstr "" +msgstr "chybà bloková zaÅÃzenà pro RAID" msgid "block devices for filesystem missing" -msgstr "" +msgstr "chybà bloková zaÅÃzenà pro systém souborů" msgid "block devices missing for command 'raid'" -msgstr "" +msgstr "chybà bloková zaÅÃzenà pro pÅÃkaz 'raid'" #. TRANSLATORS: error message, 'close' refers to close system call #, c-format msgid "close for json file '%s' failed" -msgstr "" +msgstr "close json souboru '%s' selhalo" #, c-format msgid "closing json file '%s' failed" -msgstr "" +msgstr "uzavÅenà json souboru '%s' selhalo" msgid "deleted device" -msgstr "" +msgstr "odstranÄné zaÅÃzenÃ" #, c-format msgid "device '%s' not found in mapping" -msgstr "" +msgstr "zaÅÃzenà '%s' nenalezeno v mapovánÃ" msgid "do not commit anything to disk" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/da.po new/barrel-0.2.1/po/da.po --- old/barrel-0.2.0/po/da.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/da.po 2023-05-31 12:54:56.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -322,6 +322,10 @@ msgid "Saving pools..." msgstr "" +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "" @@ -367,6 +371,10 @@ msgid "The command has the following subcommands:" msgstr "" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/de.po new/barrel-0.2.1/po/de.po --- old/barrel-0.2.0/po/de.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/de.po 2023-05-31 12:54:56.000000000 +0200 @@ -6,9 +6,9 @@ msgstr "" "Project-Id-Version: barrel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" -"PO-Revision-Date: 2023-02-06 14:14+0000\n" -"Last-Translator: Gemineo <[email protected]>\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" +"PO-Revision-Date: 2023-05-13 02:15+0000\n" +"Last-Translator: Ettore Atalan <[email protected]>\n" "Language-Team: German <https://l10n.opensuse.org/projects/barrel/master/de/"; ">\n" "Language: de\n" @@ -325,6 +325,10 @@ msgid "Saving pools..." msgstr "Pools werden gespeichert..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "Zeigt DASDs an." @@ -370,6 +374,10 @@ msgid "The command has the following subcommands:" msgstr "Kommando hat die folgenden Unterkommandos:" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "Ãbertragung" + msgid "Type" msgstr "Typ" @@ -468,9 +476,8 @@ msgid "do not commit anything to disk" msgstr "nichts auf Datenträger speichern" -#, fuzzy msgid "do not show colors" -msgstr "Partitionen auf DASDs nicht anzeigen" +msgstr "keine Farben anzeigen" msgid "do not show partitions on DASDs" msgstr "Partitionen auf DASDs nicht anzeigen" @@ -915,7 +922,7 @@ msgstr "mehrere Multipath-Geräte zur Zuordnung für '%s' gefunden" msgid "show colors" -msgstr "" +msgstr "Farben anzeigen" msgid "show help and exit" msgstr "Hilfe anzeigen und beenden" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/es.po new/barrel-0.2.1/po/es.po --- old/barrel-0.2.0/po/es.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/es.po 2023-05-31 12:54:56.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" "PO-Revision-Date: 2023-02-08 23:14+0000\n" "Last-Translator: Antonio Simón <[email protected]>\n" "Language-Team: Spanish <https://l10n.opensuse.org/projects/barrel/master/es/"; @@ -325,6 +325,10 @@ msgid "Saving pools..." msgstr "Guardando reservas..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "Muestra DASDs." @@ -370,6 +374,10 @@ msgid "The command has the following subcommands:" msgstr "El comando tiene los siguientes subcomandos:" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "Tipo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/fr.po new/barrel-0.2.1/po/fr.po --- old/barrel-0.2.0/po/fr.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/fr.po 2023-05-31 12:54:56.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" "PO-Revision-Date: 2023-02-07 18:14+0000\n" "Last-Translator: Sophie Leroy <[email protected]>\n" "Language-Team: French <https://l10n.opensuse.org/projects/barrel/master/fr/"; @@ -327,6 +327,10 @@ msgid "Saving pools..." msgstr "Enregistrement des pools..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "Affiche les DASD." @@ -372,6 +376,10 @@ msgid "The command has the following subcommands:" msgstr "La commande comporte les sous-commandes suivantes :" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "Type" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/it.po new/barrel-0.2.1/po/it.po --- old/barrel-0.2.0/po/it.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/it.po 2023-05-31 12:54:56.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" "PO-Revision-Date: 2023-02-07 13:14+0000\n" "Last-Translator: Davide Aiello <[email protected]>\n" "Language-Team: Italian <https://l10n.opensuse.org/projects/barrel/master/it/"; @@ -325,6 +325,10 @@ msgid "Saving pools..." msgstr "Salvataggio dei pool in corso..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "Mostra i DASD." @@ -370,6 +374,10 @@ msgid "The command has the following subcommands:" msgstr "Il comando dispone dei sottocomandi seguenti:" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "Tipo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/ja.po new/barrel-0.2.1/po/ja.po --- old/barrel-0.2.0/po/ja.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/ja.po 2023-06-01 09:44:02.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" -"PO-Revision-Date: 2023-01-20 00:14+0000\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" +"PO-Revision-Date: 2023-05-31 14:14+0000\n" "Last-Translator: Yasuhiko Kamata <[email protected]>\n" "Language-Team: Japanese <https://l10n.opensuse.org/projects/barrel/master/ja/"; ">\n" @@ -326,6 +326,10 @@ msgid "Saving pools..." msgstr "ãã¼ã«ãä¿åãã¦ãã¾ã..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "ãã¼ãã£ã·ã§ã³ %s ã® ID ãæªãµãã¼ãå¤ãã %s ã«å¤æ´ãã¦ãã¾ãã" + msgid "Shows DASDs." msgstr "DASD ã表示ãã¾ãã" @@ -371,6 +375,10 @@ msgid "The command has the following subcommands:" msgstr "ãã®ã³ãã³ãã«ã¯ä¸è¨ã®ãããªãµãã³ãã³ããç¨æããã¦ãã¾ã:" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "ãã©ã³ã¹ãã¼ã" + msgid "Type" msgstr "種é¡" @@ -468,9 +476,8 @@ msgid "do not commit anything to disk" msgstr "ãã£ã¹ã¯ã«å¯¾ãã¦ã¯ä½ãé©ç¨ãã¾ãã" -#, fuzzy msgid "do not show colors" -msgstr "DASD å ã®ãã¼ãã£ã·ã§ã³ã表示ãã¾ãã" +msgstr "è²ã表示ãã¾ãã" msgid "do not show partitions on DASDs" msgstr "DASD å ã®ãã¼ãã£ã·ã§ã³ã表示ãã¾ãã" @@ -921,7 +928,7 @@ msgstr "'%s' ã«å¯¾ãããã«ããã¹ã®ãããã³ã°ãè¤æ°è¦ã¤ããã¾ãã" msgid "show colors" -msgstr "" +msgstr "è²ã表示ãã¾ã" msgid "show help and exit" msgstr "ãã«ãã表示ãã¦çµäºãã¾ã" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/mk.po new/barrel-0.2.1/po/mk.po --- old/barrel-0.2.0/po/mk.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/mk.po 2023-05-31 12:54:56.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" -"PO-Revision-Date: 2023-02-16 03:14+0000\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" +"PO-Revision-Date: 2023-03-21 04:14+0000\n" "Last-Translator: Kristijan Fremen Velkovski <[email protected]>\n" "Language-Team: Macedonian <https://l10n.opensuse.org/projects/barrel/master/"; "mk/>\n" @@ -87,31 +87,31 @@ msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create filesystem --type vfat'" msgid "Alias for 'create filesystem --type xfs'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð°'create filesystem --type xfs'" msgid "Alias for 'create partition-table --type gpt'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create partition-table --type gpt'" msgid "Alias for 'create partition-table --type ms-dos'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create partition-table --type ms-dos'" msgid "Alias for 'create raid --level 0'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create raid --level 0'" msgid "Alias for 'create raid --level 1'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create raid --level 1'" msgid "Alias for 'create raid --level 10'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create raid --level 10'" msgid "Alias for 'create raid --level 4'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create raid --level 4'" msgid "Alias for 'create raid --level 5'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create raid --level 5'" msgid "Alias for 'create raid --level 6'" -msgstr "" +msgstr "ÐÐ»Ð¸Ð°Ñ Ð·Ð° 'create raid --level 6'" msgid "Block Size" msgstr "" @@ -325,6 +325,10 @@ msgid "Saving pools..." msgstr "" +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "" @@ -370,6 +374,10 @@ msgid "The command has the following subcommands:" msgstr "" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/pt_BR.po new/barrel-0.2.1/po/pt_BR.po --- old/barrel-0.2.0/po/pt_BR.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/pt_BR.po 2023-05-31 12:54:56.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" "PO-Revision-Date: 2023-02-08 14:14+0000\n" "Last-Translator: Samanta Magalhaes <[email protected]>\n" "Language-Team: Portuguese (Brazil) <https://l10n.opensuse.org/projects/"; @@ -326,6 +326,10 @@ msgid "Saving pools..." msgstr "Salvando pools..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "Mostra DASDs." @@ -371,6 +375,10 @@ msgid "The command has the following subcommands:" msgstr "O comando tem os seguintes subcomandos:" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "Tipo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/zh_CN.po new/barrel-0.2.1/po/zh_CN.po --- old/barrel-0.2.0/po/zh_CN.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/zh_CN.po 2023-05-31 12:54:56.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" "PO-Revision-Date: 2023-02-08 05:14+0000\n" "Last-Translator: Grace Yu <[email protected]>\n" "Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/barrel/"; @@ -326,6 +326,10 @@ msgid "Saving pools..." msgstr "æ£å¨ä¿åæ± ..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "æ¾ç¤º DASDã" @@ -371,6 +375,10 @@ msgid "The command has the following subcommands:" msgstr "该å½ä»¤å å«ä»¥ä¸åå½ä»¤ï¼" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "ç±»å" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/po/zh_TW.po new/barrel-0.2.1/po/zh_TW.po --- old/barrel-0.2.0/po/zh_TW.po 2023-03-13 08:18:48.000000000 +0100 +++ new/barrel-0.2.1/po/zh_TW.po 2023-05-31 12:54:56.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-13 08:05+0100\n" +"POT-Creation-Date: 2023-05-31 12:46+0200\n" "PO-Revision-Date: 2023-02-08 09:14+0000\n" "Last-Translator: Grace Yu <[email protected]>\n" "Language-Team: Chinese (Taiwan) <https://l10n.opensuse.org/projects/barrel/"; @@ -326,6 +326,10 @@ msgid "Saving pools..." msgstr "æ£å¨å²åæ± ..." +#, c-format +msgid "Setting id of partition %s from unsupported value to %s." +msgstr "" + msgid "Shows DASDs." msgstr "顯示 DASDã" @@ -371,6 +375,10 @@ msgid "The command has the following subcommands:" msgstr "該æ令å å«ä»¥ä¸åæ令ï¼" +#. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB +msgid "Transport" +msgstr "" + msgid "Type" msgstr "é¡å" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/testsuite/Makefile.am new/barrel-0.2.1/testsuite/Makefile.am --- old/barrel-0.2.0/testsuite/Makefile.am 2022-07-11 16:54:39.000000000 +0200 +++ new/barrel-0.2.1/testsuite/Makefile.am 2023-06-15 12:57:28.000000000 +0200 @@ -14,7 +14,8 @@ check_PROGRAMS = \ getopts.test table.test raid1.test xfs1.test \ complex1.test parse-line.test lvm1.test load1.test \ - pools1.test show1.test show2.test remove1.test \ + pools1.test pools2.test show1.test show2.test \ + show3.test remove1.test \ luks1.test gpt1.test misuse1.test misuse2.test \ misuse3.test ext1.test btrfs1.test stack1.test @@ -22,7 +23,8 @@ TESTS = $(check_PROGRAMS) -EXTRA_DIST = empty1.xml empty2.xml mapping1.json load1.xml \ +EXTRA_DIST = empty1.xml empty2.xml empty3.xml \ + mapping1.json load1.xml \ real1.xml real2.xml real3.xml real4.xml real5.xml \ real6.xml dmraid1.xml dmraid2.xml mapping2.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/testsuite/Makefile.in new/barrel-0.2.1/testsuite/Makefile.in --- old/barrel-0.2.0/testsuite/Makefile.in 2023-03-13 08:25:58.000000000 +0100 +++ new/barrel-0.2.1/testsuite/Makefile.in 2023-06-15 12:58:41.000000000 +0200 @@ -94,9 +94,10 @@ check_PROGRAMS = getopts.test$(EXEEXT) table.test$(EXEEXT) \ raid1.test$(EXEEXT) xfs1.test$(EXEEXT) complex1.test$(EXEEXT) \ parse-line.test$(EXEEXT) lvm1.test$(EXEEXT) \ - load1.test$(EXEEXT) pools1.test$(EXEEXT) show1.test$(EXEEXT) \ - show2.test$(EXEEXT) remove1.test$(EXEEXT) luks1.test$(EXEEXT) \ - gpt1.test$(EXEEXT) misuse1.test$(EXEEXT) misuse2.test$(EXEEXT) \ + load1.test$(EXEEXT) pools1.test$(EXEEXT) pools2.test$(EXEEXT) \ + show1.test$(EXEEXT) show2.test$(EXEEXT) show3.test$(EXEEXT) \ + remove1.test$(EXEEXT) luks1.test$(EXEEXT) gpt1.test$(EXEEXT) \ + misuse1.test$(EXEEXT) misuse2.test$(EXEEXT) \ misuse3.test$(EXEEXT) ext1.test$(EXEEXT) btrfs1.test$(EXEEXT) \ stack1.test$(EXEEXT) subdir = testsuite @@ -178,6 +179,11 @@ pools1_test_LDADD = $(LDADD) pools1_test_DEPENDENCIES = ../barrel/libbarrel.la \ ../barrel/Utils/libutils.la +pools2_test_SOURCES = pools2.cc +pools2_test_OBJECTS = pools2.$(OBJEXT) +pools2_test_LDADD = $(LDADD) +pools2_test_DEPENDENCIES = ../barrel/libbarrel.la \ + ../barrel/Utils/libutils.la raid1_test_SOURCES = raid1.cc raid1_test_OBJECTS = raid1.$(OBJEXT) raid1_test_LDADD = $(LDADD) @@ -198,6 +204,11 @@ show2_test_LDADD = $(LDADD) show2_test_DEPENDENCIES = ../barrel/libbarrel.la \ ../barrel/Utils/libutils.la +show3_test_SOURCES = show3.cc +show3_test_OBJECTS = show3.$(OBJEXT) +show3_test_LDADD = $(LDADD) +show3_test_DEPENDENCIES = ../barrel/libbarrel.la \ + ../barrel/Utils/libutils.la stack1_test_SOURCES = stack1.cc stack1_test_OBJECTS = stack1.$(OBJEXT) stack1_test_LDADD = $(LDADD) @@ -233,10 +244,10 @@ ./$(DEPDIR)/load1.Po ./$(DEPDIR)/luks1.Po ./$(DEPDIR)/lvm1.Po \ ./$(DEPDIR)/misuse1.Po ./$(DEPDIR)/misuse2.Po \ ./$(DEPDIR)/misuse3.Po ./$(DEPDIR)/parse-line.Po \ - ./$(DEPDIR)/pools1.Po ./$(DEPDIR)/raid1.Po \ - ./$(DEPDIR)/remove1.Po ./$(DEPDIR)/show1.Po \ - ./$(DEPDIR)/show2.Po ./$(DEPDIR)/stack1.Po \ - ./$(DEPDIR)/table.Po ./$(DEPDIR)/xfs1.Po + ./$(DEPDIR)/pools1.Po ./$(DEPDIR)/pools2.Po \ + ./$(DEPDIR)/raid1.Po ./$(DEPDIR)/remove1.Po \ + ./$(DEPDIR)/show1.Po ./$(DEPDIR)/show2.Po ./$(DEPDIR)/show3.Po \ + ./$(DEPDIR)/stack1.Po ./$(DEPDIR)/table.Po ./$(DEPDIR)/xfs1.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -258,12 +269,12 @@ am__v_CXXLD_1 = SOURCES = btrfs1.cc complex1.cc ext1.cc getopts.cc gpt1.cc load1.cc \ luks1.cc lvm1.cc misuse1.cc misuse2.cc misuse3.cc \ - parse-line.cc pools1.cc raid1.cc remove1.cc show1.cc show2.cc \ - stack1.cc table.cc xfs1.cc + parse-line.cc pools1.cc pools2.cc raid1.cc remove1.cc show1.cc \ + show2.cc show3.cc stack1.cc table.cc xfs1.cc DIST_SOURCES = btrfs1.cc complex1.cc ext1.cc getopts.cc gpt1.cc \ load1.cc luks1.cc lvm1.cc misuse1.cc misuse2.cc misuse3.cc \ - parse-line.cc pools1.cc raid1.cc remove1.cc show1.cc show2.cc \ - stack1.cc table.cc xfs1.cc + parse-line.cc pools1.cc pools2.cc raid1.cc remove1.cc show1.cc \ + show2.cc show3.cc stack1.cc table.cc xfs1.cc RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -674,7 +685,8 @@ AM_DEFAULT_SOURCE_EXT = .cc TESTS = $(check_PROGRAMS) -EXTRA_DIST = empty1.xml empty2.xml mapping1.json load1.xml \ +EXTRA_DIST = empty1.xml empty2.xml empty3.xml \ + mapping1.json load1.xml \ real1.xml real2.xml real3.xml real4.xml real5.xml \ real6.xml dmraid1.xml dmraid2.xml mapping2.json @@ -773,6 +785,10 @@ @rm -f pools1.test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(pools1_test_OBJECTS) $(pools1_test_LDADD) $(LIBS) +pools2.test$(EXEEXT): $(pools2_test_OBJECTS) $(pools2_test_DEPENDENCIES) $(EXTRA_pools2_test_DEPENDENCIES) + @rm -f pools2.test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(pools2_test_OBJECTS) $(pools2_test_LDADD) $(LIBS) + raid1.test$(EXEEXT): $(raid1_test_OBJECTS) $(raid1_test_DEPENDENCIES) $(EXTRA_raid1_test_DEPENDENCIES) @rm -f raid1.test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(raid1_test_OBJECTS) $(raid1_test_LDADD) $(LIBS) @@ -789,6 +805,10 @@ @rm -f show2.test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(show2_test_OBJECTS) $(show2_test_LDADD) $(LIBS) +show3.test$(EXEEXT): $(show3_test_OBJECTS) $(show3_test_DEPENDENCIES) $(EXTRA_show3_test_DEPENDENCIES) + @rm -f show3.test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(show3_test_OBJECTS) $(show3_test_LDADD) $(LIBS) + stack1.test$(EXEEXT): $(stack1_test_OBJECTS) $(stack1_test_DEPENDENCIES) $(EXTRA_stack1_test_DEPENDENCIES) @rm -f stack1.test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(stack1_test_OBJECTS) $(stack1_test_LDADD) $(LIBS) @@ -820,10 +840,12 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misuse3.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-line.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pools1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pools2.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raid1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remove1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/show1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/show2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/show3.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stack1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfs1.Po@am__quote@ # am--include-marker @@ -1232,10 +1254,12 @@ -rm -f ./$(DEPDIR)/misuse3.Po -rm -f ./$(DEPDIR)/parse-line.Po -rm -f ./$(DEPDIR)/pools1.Po + -rm -f ./$(DEPDIR)/pools2.Po -rm -f ./$(DEPDIR)/raid1.Po -rm -f ./$(DEPDIR)/remove1.Po -rm -f ./$(DEPDIR)/show1.Po -rm -f ./$(DEPDIR)/show2.Po + -rm -f ./$(DEPDIR)/show3.Po -rm -f ./$(DEPDIR)/stack1.Po -rm -f ./$(DEPDIR)/table.Po -rm -f ./$(DEPDIR)/xfs1.Po @@ -1297,10 +1321,12 @@ -rm -f ./$(DEPDIR)/misuse3.Po -rm -f ./$(DEPDIR)/parse-line.Po -rm -f ./$(DEPDIR)/pools1.Po + -rm -f ./$(DEPDIR)/pools2.Po -rm -f ./$(DEPDIR)/raid1.Po -rm -f ./$(DEPDIR)/remove1.Po -rm -f ./$(DEPDIR)/show1.Po -rm -f ./$(DEPDIR)/show2.Po + -rm -f ./$(DEPDIR)/show3.Po -rm -f ./$(DEPDIR)/stack1.Po -rm -f ./$(DEPDIR)/table.Po -rm -f ./$(DEPDIR)/xfs1.Po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/testsuite/empty3.xml new/barrel-0.2.1/testsuite/empty3.xml --- old/barrel-0.2.0/testsuite/empty3.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/barrel-0.2.1/testsuite/empty3.xml 2023-06-15 12:57:28.000000000 +0200 @@ -0,0 +1,43 @@ +<?xml version="1.0"?> +<!-- generated by libstorage-ng version 4.5.119, kassandra.suse.de, 2023-06-15 06:58:56 GMT --> +<Devicegraph> + <Devices> + <Disk> + <sid>42</sid> + <name>/dev/nvme0n1</name> + <sysfs-name>nvme0n1</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/nvme/nvme0/nvme0n1</sysfs-path> + <region> + <length>1000215216</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:05:00.0-nvme-1</udev-path> + <udev-id>nvme-eui.0000000001000000e4d25cb0ae765001</udev-id> + <range>256</range> + <transport>PCIe</transport> + </Disk> + <Disk> + <sid>43</sid> + <name>/dev/nvme1n1</name> + <sysfs-name>nvme1n1</sysfs-name> + <sysfs-path>/devices/pci0000:16/0000:16:00.0/0000:17:00.0/nvme/nvme1/nvme1n1</sysfs-path> + <region> + <length>1000215216</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:17:00.0-nvme-1</udev-path> + <udev-id>nvme-eui.0000000001000000e4d25ce5261f5301</udev-id> + <range>256</range> + <transport>PCIe</transport> + </Disk> + <Gpt> + <sid>44</sid> + </Gpt> + </Devices> + <Holders> + <User> + <source-sid>42</source-sid> + <target-sid>44</target-sid> + </User> + </Holders> +</Devicegraph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/testsuite/pools2.cc new/barrel-0.2.1/testsuite/pools2.cc --- old/barrel-0.2.0/testsuite/pools2.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/barrel-0.2.1/testsuite/pools2.cc 2023-06-15 12:57:28.000000000 +0200 @@ -0,0 +1,70 @@ + +#define BOOST_TEST_DYN_LINK +#define BOOST_TEST_MODULE barrel + +#include <numeric> +#include <boost/test/unit_test.hpp> + +#include "../barrel/handle.h" +#include "../barrel/Utils/Args.h" + + +using namespace std; +using namespace storage; +using namespace barrel; + + +BOOST_AUTO_TEST_CASE(test1) +{ + Args args({ "--dry-run", "--yes" }); + + vector<string> output = { + "Probing... done", + "create gpt /dev/nvme1n1", + " Create GPT on /dev/nvme1n1", + "create raid1 --size 100g --pool-name \"NVMes (512 B)\"", + " Create partition /dev/nvme0n1p1 (100.22 GiB)", + " Set id of partition /dev/nvme0n1p1 to Linux RAID", + " Create partition /dev/nvme1n1p1 (100.22 GiB)", + " Set id of partition /dev/nvme1n1p1 to Linux RAID", + " Create MD RAID1 /dev/md0 (100.00 GiB) from /dev/nvme0n1p1 (100.22 GiB) and /dev/nvme1n1p1 (100.22 GiB)", + " Add /dev/md0 to /etc/mdadm.conf", + "create pool --name MDs /dev/md0", + "show raids", + "Name â Size â Level â Metadata â Chunk Size â Devices â Usage â Pool", + "ââââââââââ¼âââââââââââââ¼ââââââââ¼âââââââââââ¼âââââââââââââ¼ââââââââââ¼ââââââââ¼âââââ", + "/dev/md0 â 100.00 GiB â RAID1 â default â â 2 â â MDs", + "show pools", + "Name â Devices â Size â Used", + "ââââââââââââââââ¼ââââââââââ¼âââââââââââââ¼âââââââ", + "MDs â 1 â 0 B â", + "ââ/dev/md0 ! â â â", + "NVMes (512 B) â 2 â 953.88 GiB â 21.01%", + "ââ/dev/nvme0n1 â â 476.94 GiB â 21.01%", + "ââ/dev/nvme1n1 â â 476.94 GiB â 21.01%", + "quit" + }; + + Testsuite testsuite; + testsuite.devicegraph_filename = "empty3.xml"; + + testsuite.readlines = { + "create gpt /dev/nvme1n1", + "create raid1 --size 100g --pool-name \"NVMes (512 B)\"", + "create pool --name MDs /dev/md0", + "show raids", + "show pools", + "quit" + }; + + ostringstream buffer; + streambuf* old = cout.rdbuf(buffer.rdbuf()); + handle(args.argc(), args.argv(), &testsuite); + cout.rdbuf(old); + + string lhs = buffer.str(); + string rhs = accumulate(output.begin(), output.end(), ""s, + [](auto a, auto b) { return a + b + "\n"; }); + + BOOST_CHECK_EQUAL(lhs, rhs); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.0/testsuite/show3.cc new/barrel-0.2.1/testsuite/show3.cc --- old/barrel-0.2.0/testsuite/show3.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/barrel-0.2.1/testsuite/show3.cc 2023-06-15 12:57:28.000000000 +0200 @@ -0,0 +1,50 @@ + +#define BOOST_TEST_DYN_LINK +#define BOOST_TEST_MODULE barrel + +#include <numeric> +#include <boost/test/unit_test.hpp> + +#include "../barrel/handle.h" +#include "../barrel/Utils/Args.h" + + +using namespace std; +using namespace storage; +using namespace barrel; + + +BOOST_AUTO_TEST_CASE(test1) +{ + Args args({ "--dry-run", "--yes" }); + + vector<string> output = { + "Probing... done", + "show pools", + "Name â Devices â Size â Used", + "ââââââââââââââââââ¼ââââââââââ¼âââââââââââââ¼ââââââ", + "NVMes (512 B) â 2 â 476.94 GiB â 0.00%", + "ââ/dev/nvme0n1 â â 476.94 GiB â 0.00%", + "ââ/dev/nvme1n1 ! â â â", + "quit" + }; + + Testsuite testsuite; + testsuite.devicegraph_filename = "empty3.xml"; + + testsuite.readlines = { + "show pools", + "quit" + }; + + ostringstream buffer; + streambuf* old = cout.rdbuf(buffer.rdbuf()); + handle(args.argc(), args.argv(), &testsuite); + cout.rdbuf(old); + + string lhs = buffer.str(); + string rhs = accumulate(output.begin(), output.end(), ""s, + [](auto a, auto b) { return a + b + "\n"; }); + + BOOST_CHECK_EQUAL(lhs, rhs); +}
