Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2016-09-08 17:38:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2016-08-18 10:18:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2016-09-08 17:38:21.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Sep 07 14:16:38 CEST 2016 - [email protected] + +- improved message for creating volumes with a filesystem but + without a mountpoint (bsc#996208) +- 2.26.8 + +------------------------------------------------------------------- +Tue Sep 06 10:45:35 CEST 2016 - [email protected] + +- merged pull request to not set boot flag on DASDs (see + bsc#935127) +- 2.26.7 + +------------------------------------------------------------------- Old: ---- libstorage-2.26.6.tar.bz2 New: ---- libstorage-2.26.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.43H6RZ/_old 2016-09-08 17:38:22.000000000 +0200 +++ /var/tmp/diff_new_pack.43H6RZ/_new 2016-09-08 17:38:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.26.6 +Version: 2.26.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.26.6.tar.bz2 -> libstorage-2.26.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.6/VERSION new/libstorage-2.26.8/VERSION --- old/libstorage-2.26.6/VERSION 2016-08-10 11:55:10.000000000 +0200 +++ new/libstorage-2.26.8/VERSION 2016-09-07 16:45:12.000000000 +0200 @@ -1 +1 @@ -2.26.6 +2.26.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.6/po/es.po new/libstorage-2.26.8/po/es.po --- old/libstorage-2.26.6/po/es.po 2016-01-18 11:10:13.000000000 +0100 +++ new/libstorage-2.26.8/po/es.po 2016-08-27 20:55:10.000000000 +0200 @@ -17,15 +17,16 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 15:59+0200\n" -"PO-Revision-Date: 2012-06-06 10:28-0300\n" -"Last-Translator: Sergio Gabriel Teves <[email protected]>\n" -"Language-Team: Spanish <[email protected]>\n" +"PO-Revision-Date: 2016-08-27 18:51+0000\n" +"Last-Translator: Gustavo Sobrales <[email protected]>\n" +"Language-Team: Spanish " +"<https://l10n.opensuse.org/projects/libstorage/master/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.6\n" "X-Poedit-Language: Spanish\n" #. text displayed during action @@ -324,9 +325,10 @@ #. displayed text before action, %1$s is replaced by subvolume name e.g. tmp #. %2$s is replaced by device name e.g. /dev/sda1 #: ../storage/Btrfs.cc:1004 -#, fuzzy, c-format +#, c-format msgid "Create subvolume %1$s on device %2$s with option \"no copy on write\"" -msgstr "Crear subvolumen %1$s en dispositivo %2$s" +msgstr "" +"Crear subvolumen %1$s en dispositivo %2$s con opción \"no copy on write\"" #. displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 #. %2$s is replaced by size (e.g. 623.5 MB) @@ -432,9 +434,10 @@ #. displayed text during action, %1$s is replaced by subvolume name e.g. tmp #. %2$s is replaced by device name e.g. /dev/sda #: ../storage/Btrfs.cc:987 -#, fuzzy, c-format +#, c-format msgid "Creating subvolume %1$s on device %2$s with option \"no copy on write\"" -msgstr "Creando subvolumen %1$s en dispositivo %2$s" +msgstr "" +"Creando subvolumen %1$s en dispositivo %2$s con opción \"no copy on write\"" #. displayed during action #. %1$s is replaced by device name e.g. /dev/hda1 @@ -1020,8 +1023,7 @@ #: ../storage/Dm.cc:468 #, c-format msgid "Formatting device mapper volume %1$s (%2$s) with %3$s " -msgstr "" -"Formateando el volumen del mapeador de dispositivos %1$s (%2$s) con %3$s" +msgstr "Formateando el volumen del dispositivo %1$s (%2$s) con %3$s " #. displayed text during action, %1$s is replaced by device name e.g. /dev/system/var #. %2$s is replaced by filename (e.g. /var/adm/secure) @@ -1031,7 +1033,7 @@ #, c-format msgid "Formatting file-based device %1$s of %2$s (%3$s) with %4$s " msgstr "" -"Formateando el dispositivo basado en archivo %1$s de %2$s (%3$s) con %4$s" +"Formateando el dispositivo basado en archivo %1$s of %2$s (%3$s) con %4$s " #. displayed text during action, %1$s is replaced by device name e.g. /dev/system/var #. %2$s is replaced by size (e.g. 623.5 MB) @@ -1055,7 +1057,7 @@ #: ../storage/Partition.cc:476 #, c-format msgid "Formatting partition %1$s (%2$s) with %3$s " -msgstr "Formateando la partición %1$s (%2$s) con %3$s" +msgstr "Formateando la partición %1$s (%2$s) con %3$s " #. displayed text during action, %1$s is replaced by device name e.g. /dev/md0 #. %2$s is replaced by size (e.g. 623.5 MB) @@ -1063,7 +1065,7 @@ #: ../storage/Md.cc:439 #, c-format msgid "Formatting software RAID %1$s (%2$s) with %3$s " -msgstr "Formateando el RAID por software %1$s (%2$s) con %3$s" +msgstr "Formateando el RAID por software RAID %1$s (%2$s) con %3$s " #. symbol for "giga" (best keep untranslated) #: ../storage/HumanString.cc:86 @@ -1395,7 +1397,7 @@ #: ../storage/Storage.cc:5587 msgid "Setting file attributes with chattr failed." -msgstr "" +msgstr "Falló el cambio de atributos con chattr." #. displayed during action #. %1$s is replaced by device name e.g. /dev/hda1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.6/storage/Disk.cc new/libstorage-2.26.8/storage/Disk.cc --- old/libstorage-2.26.6/storage/Disk.cc 2016-05-27 13:37:38.000000000 +0200 +++ new/libstorage-2.26.8/storage/Disk.cc 2016-09-06 10:45:15.000000000 +0200 @@ -1846,7 +1846,8 @@ if (label == "dvh" || label == "mac") options << " set " << p->nr() << " swap " << (p->id()==Partition::ID_SWAP?"on":"off"); - options << " set " << p->nr() << " boot " << ((p->boot()||p->id()==Partition::ID_GPT_BOOT)?"on":"off"); + if (label != "dasd") + options << " set " << p->nr() << " boot " << ((p->boot()||p->id()==Partition::ID_GPT_BOOT)?"on":"off"); if (label == "gpt") { options << " set " << p->nr() << " prep " << (p->id()==Partition::ID_GPT_PREP?"on":"off"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.6/storage/Volume.cc new/libstorage-2.26.8/storage/Volume.cc --- old/libstorage-2.26.6/storage/Volume.cc 2016-08-08 11:10:12.000000000 +0200 +++ new/libstorage-2.26.8/storage/Volume.cc 2016-09-07 16:45:12.000000000 +0200 @@ -3347,85 +3347,135 @@ Text Volume::createText(bool doing) const { - // key: mountpoint - std::map<std::string, Text> msgs_by_mp; - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - msgs_by_mp["swap"] = _("Create swap volume %1$s (%2$s)"); - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - // %3$s is replaced by file system type (e.g. reiserfs) - msgs_by_mp["/"] = _("Create root volume %1$s (%2$s) with %3$s"); - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - // %3$s is replaced by file system type (e.g. reiserfs) - msgs_by_mp[getStorage()->bootMount()] = _("Create boot volume %1$s (%2$s) with %3$s"); - - // key: (has-mountpoint, is-encrypted) - std::map<std::pair<bool, bool>, Text> msgs_by_mpenc; - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - // %3$s is replaced by file system type (e.g. reiserfs) - // %4$s is replaced by mount point (e.g. /usr) - msgs_by_mpenc[std::make_pair(1, 0)] = _("Create volume %1$s (%2$s) for %4$s with %3$s"); - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - // %3$s is replaced by file system type (e.g. reiserfs) - // %4$s is replaced by mount point (e.g. /usr) - msgs_by_mpenc[std::make_pair(1, 1)] = _("Create encrypted volume %1$s (%2$s) for %4$s with %3$s"); - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - msgs_by_mpenc[std::make_pair(0, 0)] = _("Create volume %1$s (%2$s)"); - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - msgs_by_mpenc[std::make_pair(0, 1)] = _("Create encrypted volume %1$s (%2$s)"); - - // key: partition-id - std::map<int, Text> msgs_by_pid; - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - msgs_by_pid[Partition::ID_GPT_BIOS] = _("Create BIOS grub volume %1$s (%2$s)"); - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - msgs_by_pid[Partition::ID_GPT_PREP] = _("Create GPT PReP volume %1$s (%2$s)"); - // displayed before action - // %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by size (e.g. 623.5 MB) - msgs_by_pid[Partition::ID_PPC_PREP] = _("Create PReP volume %1$s (%2$s)"); + Text txt; if (doing) - // displayed during action - // %1$s is replaced by device name e.g. /dev/hda1 - return sformat(_("Creating volume %1$s"), dev.c_str()); - - auto msg = msgs_by_mpenc[std::make_pair(!mp.empty(), encryption != ENC_NONE)]; - - if (!mp.empty()) { - auto it = msgs_by_mp.find(mp); - if (it != msgs_by_mp.end()) - msg = (*it).second; + // displayed text during action, + // %1$s is replaced by device name e.g. /dev/sda1 + txt = sformat(_("Creating volume %1$s"), dev.c_str()); } else { - if (auto p = dynamic_cast<const Partition*>(this)) + const Partition* p = dynamic_cast<const Partition*>(this); + + if (mp == "swap") + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB) + txt = sformat(_("Create swap volume %1$s (%2$s)"), dev.c_str(), + sizeString().c_str()); + } + else if (mp == "/") + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB), + // %3$s is replaced by file system type (e.g. reiserfs) + txt = sformat(_("Create root volume %1$s (%2$s) with %3$s"), + dev.c_str(), sizeString().c_str(), fsTypeString().c_str()); + } + else if (p && p->id() == Partition::ID_GPT_BIOS) + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB) + txt = sformat(_("Create BIOS grub volume %1$s (%2$s)"), dev.c_str(), + sizeString().c_str()); + } + else if (p && p->id() == Partition::ID_PPC_PREP) + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB) + txt = sformat(_("Create PReP volume %1$s (%2$s)"), dev.c_str(), + sizeString().c_str()); + } + else if (p && p->id() == Partition::ID_GPT_PREP) + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB) + txt = sformat(_("Create GPT PReP volume %1$s (%2$s)"), dev.c_str(), + sizeString().c_str()); + } + else if (mp == getStorage()->bootMount()) + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB), + // %3$s is replaced by file system type (e.g. reiserfs) + txt = sformat(_("Create boot volume %1$s (%2$s) with %3$s"), + dev.c_str(), sizeString().c_str(), fsTypeString().c_str()); + } + else if (!mp.empty()) + { + if (encryption == ENC_NONE) + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1 + // %2$s is replaced by size (e.g. 623.5 MB), + // %3$s is replaced by file system type (e.g. reiserfs), + // %4$s is replaced by mount point (e.g. /usr) + txt = sformat(_("Create volume %1$s (%2$s) for %4$s with %3$s"), + dev.c_str(), sizeString().c_str(), fsTypeString().c_str(), + mp.c_str()); + } + else + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB), + // %3$s is replaced by file system type (e.g. reiserfs), + // %4$s is replaced by mount point (e.g. /usr) + txt = sformat(_("Create encrypted volume %1$s (%2$s) for %4$s with %3$s"), + dev.c_str(), sizeString().c_str(), fsTypeString().c_str(), + mp.c_str()); + } + } + else if (!contains(vector<FsType>({ FSUNKNOWN, FSNONE }), fs)) + { + if (encryption == ENC_NONE) + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB), + // %3$s is replaced by file system type (e.g. ext4) + txt = sformat(_("Create volume %1$s (%2$s) with %3$s"), dev.c_str(), + sizeString().c_str(), fsTypeString().c_str()); + } + else + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB), + // %3$s is replaced by file system type (e.g. ext4) + txt = sformat(_("Create encrypted volume %1$s (%2$s) with %3$s"), dev.c_str(), + sizeString().c_str(), fsTypeString().c_str()); + } + } + else { - auto it = msgs_by_pid.find(p->id()); - if (it != msgs_by_pid.end()) - msg = (*it).second; + if (encryption == ENC_NONE) + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB) + txt = sformat(_("Create volume %1$s (%2$s)"), dev.c_str(), sizeString().c_str()); + } + else + { + // displayed text before action, + // %1$s is replaced by device name e.g. /dev/sda1, + // %2$s is replaced by size (e.g. 623.5 MB) + txt = sformat(_("Create encrypted volume %1$s (%2$s)"), dev.c_str(), + sizeString().c_str()); + } } } - return sformat(msg, dev.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str()); + return txt; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.6/storage/gen_md5sum.cc new/libstorage-2.26.8/storage/gen_md5sum.cc --- old/libstorage-2.26.6/storage/gen_md5sum.cc 2016-08-10 11:56:25.000000000 +0200 +++ new/libstorage-2.26.8/storage/gen_md5sum.cc 2016-09-07 16:46:05.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "faeece6ccfc8ba61d1c3c445bbe7b3c6" -#define SOURCES_MD5_DATE " Wed Aug 10 09:56:25 UTC 2016 " +#define SOURCES_MD5SUM "19a8ae8ead6e08771b4236a4c64b181a" +#define SOURCES_MD5_DATE " Wed Sep 7 14:46:05 UTC 2016 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; }
