From 7fd0ad57956f55176df610e91617eda1676f84e7 Mon Sep 17 00:00:00 2001 From: Caio Carvalho Date: Mon, 13 Aug 2018 09:51:35 -0300 Subject: [PATCH 01/18] [partition] Disabling partition buttons for inactive RAID. --- src/modules/partition/gui/PartitionPage.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 994adc3e8..f23eecd6e 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -4,6 +4,7 @@ * Copyright 2015-2016, Teo Mrnjavac * Copyright 2018, Adriaan de Groot * Copyright 2018, Andrius Štikonas + * Copyright 2018, Caio Jordão Carvalho * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,6 +48,7 @@ // KPMcore #include #include +#include #include #include @@ -146,6 +148,7 @@ PartitionPage::updateButtons() bool isInVG = m_core->isInVG( partition ); create = isFree; + // Keep it simple for now: do not support editing extended partitions as // it does not work with our current edit implementation which is // actually remove + add. This would not work with extended partitions @@ -160,8 +163,17 @@ PartitionPage::updateButtons() if ( m_ui->deviceComboBox->currentIndex() >= 0 ) { QModelIndex deviceIndex = m_core->deviceModel()->index( m_ui->deviceComboBox->currentIndex(), 0 ); - if ( m_core->deviceModel()->deviceForIndex( deviceIndex )->type() != Device::Type::LVM_Device ) + auto device = m_core->deviceModel()->deviceForIndex( deviceIndex ); + if ( device->type() != Device::Type::LVM_Device ) + { createTable = true; + + if ( device->type() == Device::Type::SoftwareRAID_Device && + static_cast< SoftwareRAID* >(device)->status() == SoftwareRAID::Status::Inactive ) { + createTable = false; + create = false; + } + } else { currentDeviceIsVG = true; From b5a2a5bbdd8020fd4f9663c02a5382ea9d74a4ef Mon Sep 17 00:00:00 2001 From: Caio Carvalho Date: Mon, 13 Aug 2018 12:26:00 -0300 Subject: [PATCH 02/18] [partition] Don't show erase button for inactive RAID. --- src/modules/partition/gui/ChoicePage.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index bef6e4966..17f0a95ea 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -48,6 +48,7 @@ #include #include +#include #include #include @@ -1182,6 +1183,11 @@ ChoicePage::setupActions() bool atLeastOneCanBeResized = false; bool atLeastOneCanBeReplaced = false; bool atLeastOneIsMounted = false; // Suppress 'erase' if so + bool isInactiveRAID = false; + + if ( currentDevice->type() == Device::Type::SoftwareRAID_Device && + static_cast< SoftwareRAID* >(currentDevice)->status() == SoftwareRAID::Status::Inactive ) + isInactiveRAID = true; for ( auto it = PartitionIterator::begin( currentDevice ); it != PartitionIterator::end( currentDevice ); ++it ) @@ -1305,7 +1311,7 @@ ChoicePage::setupActions() else force_uncheck( m_grp, m_alongsideButton ); - if ( !atLeastOneIsMounted ) + if ( !atLeastOneIsMounted && !isInactiveRAID ) m_eraseButton->show(); // None mounted else force_uncheck( m_grp, m_eraseButton ); From 01a972c6ea6704c1c2f0f252f7ff4c2296029e07 Mon Sep 17 00:00:00 2001 From: Caio Carvalho Date: Mon, 13 Aug 2018 13:05:41 -0300 Subject: [PATCH 03/18] [partition] Fixing LVM LV name line edit visibility. --- src/modules/partition/gui/CreatePartitionDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 0e7602c08..7823d743d 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -72,7 +72,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par m_ui->encryptWidget->setText( tr( "En&crypt" ) ); m_ui->encryptWidget->hide(); - if (m_device->type() == Device::Type::Disk_Device) { + if (m_device->type() != Device::Type::LVM_Device) { m_ui->lvNameLabel->hide(); m_ui->lvNameLineEdit->hide(); } From 83963b80f145e0db651f4eae56e2c84b6acf98a2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 11 Sep 2018 08:18:55 -0400 Subject: [PATCH 04/18] Changelog: update markup to simplify pasting to site --- CHANGES | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index d76ca0ea6..56526aad2 100644 --- a/CHANGES +++ b/CHANGES @@ -3,15 +3,15 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -= 3.2.3 (unreleased) = +# 3.2.3 (unreleased) # This release contains contributions from (alphabetically by first name): -== Core == +## Core ## -== Modules == +## Modules ## -= 3.2.2 (2018-09-04) = +# 3.2.2 (2018-09-04) # This release contains contributions from (alphabetically by first name): - Andrius Štikonas @@ -22,7 +22,7 @@ This release contains contributions from (alphabetically by first name): - Simon Quigley - Walter Lapchynski -== Core == +## Core ## * Example configurations are **no longer installed** by default. The default setting for *INSTALL_CONFIG* has changed. Distributions @@ -38,7 +38,7 @@ This release contains contributions from (alphabetically by first name): * A new `ci/RELEASE.sh` script has been added to streamline releases; it is not guaranteed to work anywhere in particular though. -== Modules == +## Modules ## * When multiple modules are mutually exclusive, or don't make sense to enable concurrectly, a new `USE_` framework has been added @@ -68,7 +68,7 @@ This release contains contributions from (alphabetically by first name): Distro's are **strongly advised** to re-test their DM configuration and installation with the revamped code. -**3.2.1** (2018-06-25) +# 3.2.1 (2018-06-25) # This release contains contributions from (alphabetically by first name): - Bill Auguer @@ -76,7 +76,7 @@ This release contains contributions from (alphabetically by first name): - Phil Mueller - Raul Rodrigo Segura - == Core == +## Core ## * Qt 5.7 is now the minimum required Qt version. Because KPMCore (a fairly fundamental dependency) requires Qt 5.7, Calamares @@ -91,7 +91,7 @@ This release contains contributions from (alphabetically by first name): ignoring some configuration errors. This will certainly cause problems for distributions with sloppy configurations. -== Modules == +## Modules ## * New module preservefiles, keeps (log) files around after install; this duplicates functionality with the unmount module, but unmount @@ -111,7 +111,7 @@ This release contains contributions from (alphabetically by first name): all the comment-lines in the file and writes enabled locales at the end, with a descriptive comment. -**3.2.0** (2018-05-17) +# 3.2.0 (2018-05-17) # This release contains contributions from (alphabetically by first name): - Alf Gaida @@ -119,7 +119,7 @@ This release contains contributions from (alphabetically by first name): - Caio Carvalho - Frede H -== Modules == +## Modules ## * UI annoyances in the partitioning module were fixed; the mount-point selector is now more obvious when no mount-point From be8de205af02b25b59ed44c24e87a840775eab08 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 11 Sep 2018 08:26:32 -0400 Subject: [PATCH 05/18] CI: be more verbose in the CI --- ci/travis-continuous.sh | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/ci/travis-continuous.sh b/ci/travis-continuous.sh index 0b7b8c548..fb82f3ee0 100755 --- a/ci/travis-continuous.sh +++ b/ci/travis-continuous.sh @@ -21,16 +21,34 @@ echo -e "###\n### make\n###" make -j2 || { make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; } echo -e "###\n### make install\n###" + +install_debugging() { + ls -la $( find "$1" -type f -name '*.so' ) +} + +echo "# System status" +df -h + echo "# Build results" -find "$BUILDDIR" -name '*.so' +install_debugging "$BUILDDIR" echo "# Install" DESTDIR=/build/INSTALL_ROOT mkdir -p "$DESTDIR" -result=true -make install VERBOSE=1 DESTDIR="$DESTDIR" || result=false +if make install VERBOSE=1 DESTDIR="$DESTDIR" ; +then + echo "# .. install OK" + result=true +else + echo "# .. install failed" + result=false +fi + +echo "# System status" +df -h echo "# Install results" -find "$DESTDIR" -type f +install_debug "$DESTDIR" + $result # Result of make install, above From 933ad8239252eaea4a97159a05aabed864b5a2a6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 11 Sep 2018 10:23:48 -0400 Subject: [PATCH 06/18] CI: increase build directory size - Fix typo in the build-debugging bits - Increase tmpfs size of /build because it looks like "make install" ends up filling the disk, and then it fails. --- .travis.yml | 2 +- ci/travis-continuous.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0885dcd81..2b11af912 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,5 @@ install: - docker build -t calamares . script: - - docker run -v $PWD:/src --tmpfs /build:rw,size=65536k -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh" + - docker run -v $PWD:/src --tmpfs /build:rw,size=81920k -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh" diff --git a/ci/travis-continuous.sh b/ci/travis-continuous.sh index fb82f3ee0..eccb6743e 100755 --- a/ci/travis-continuous.sh +++ b/ci/travis-continuous.sh @@ -49,6 +49,6 @@ echo "# System status" df -h echo "# Install results" -install_debug "$DESTDIR" +install_debugging "$DESTDIR" $result # Result of make install, above From 649a1407cb799d0ced273fa3f02f2402011cdd3b Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 12 Sep 2018 05:01:23 -0400 Subject: [PATCH 07/18] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_bg.ts | 154 ++++++++++++++++++++-------------------- lang/calamares_id.ts | 10 +-- lang/calamares_tr_TR.ts | 2 +- 3 files changed, 84 insertions(+), 82 deletions(-) diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index f9dc45c36..d75f03746 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -50,7 +50,7 @@ Blank Page - + Празна страница @@ -192,22 +192,22 @@ Calamares Initialization Failed - + Инициализацията на Calamares се провали %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + %1 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията. <br/>The following modules could not be loaded: - + <br/>Следните модули не могат да се заредят: &Install - + &Инсталирай @@ -287,17 +287,17 @@ The installer will quit and all changes will be lost. unparseable Python error - неанализируема Python грешка + неанализируема грешка на Python unparseable Python traceback - неанализируемо Python проследяване + неанализируемо проследяване на Python Unfetchable Python error. - Недостъпна Python грешка. + Недостъпна грешка на Python. @@ -504,17 +504,17 @@ The installer will quit and all changes will be lost. Could not run command. - + Командата не може да се изпълни. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + Командата се изпълнява в средата на хоста и трябва да установи местоположението на основния дял, но rootMountPoint не е определен. The command needs to know the user's name, but no username is defined. - + Командата трябва да установи потребителското име на профила, но такова не е определено. @@ -522,7 +522,7 @@ The installer will quit and all changes will be lost. Contextual Processes Job - + Задача с контекстуални процеси @@ -580,7 +580,7 @@ The installer will quit and all changes will be lost. En&crypt - En%crypt + Ши&фриране @@ -784,12 +784,12 @@ The installer will quit and all changes will be lost. Write LUKS configuration for Dracut to %1 - + Запиши LUKS конфигурация за Dracut на %1 Skip writing LUKS configuration for Dracut: "/" partition is not encrypted - + Пропусни записването на LUKS конфигурация за Dracut: "/" дял не е шифриран @@ -939,7 +939,7 @@ The installer will quit and all changes will be lost. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style=" font-style:italic;">Done</span> or close the installer.</p></body></html> - + <html><head/><body><p>Когато тази опция е избрана, Вашата система ще се рестартира незабавно при натискане на <span style=" font-style:italic;">Готово</span> или при затваряне на инсталатора.</p></body></html> @@ -954,7 +954,7 @@ The installer will quit and all changes will be lost. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - + <h1>Инсталацията е неуспешна</h1><br/>%1 не е инсталиран на Вашия компютър.<br/>Съобщението с грешката е: %2. @@ -967,12 +967,12 @@ The installer will quit and all changes will be lost. Installation Complete - + Инсталацията е завършена The installation of %1 is complete. - + Инсталацията на %1 е завършена. @@ -1156,7 +1156,7 @@ The installer will quit and all changes will be lost. The numbers and dates locale will be set to %1. - + Форматът на цифрите и датата ще бъде %1. @@ -1214,12 +1214,12 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + Мрежова инсталация. (Изключена: Списъкът с пакети не може да бъде извлечен, проверете Вашата Интернет връзка) Network Installation. (Disabled: Received invalid groups data) - + Мрежова инсталация. (Изключена: Получени са данни за невалидни групи) @@ -1250,12 +1250,12 @@ The installer will quit and all changes will be lost. Memory allocation error when setting '%1' - + Грешка при разпределяне на паметта по време на настройването на '%1' Memory allocation error - + Грешка при разпределяне на паметта @@ -1270,7 +1270,7 @@ The installer will quit and all changes will be lost. The password differs with case changes only - + Паролата се различава само със смяна на главни и малки букви @@ -1280,62 +1280,62 @@ The installer will quit and all changes will be lost. The password contains the user name in some form - + Паролата съдържа потребителското име под някаква форма The password contains words from the real name of the user in some form - + Паролата съдържа думи от истинското име на потребителя под някаква форма The password contains forbidden words in some form - + Паролата съдържа забранени думи под някаква форма The password contains less than %1 digits - + Паролата съдържа по-малко от %1 цифри The password contains too few digits - + Паролата съдържа твърде малко цифри The password contains less than %1 uppercase letters - + Паролата съдържа по-малко от %1 главни букви The password contains too few uppercase letters - + Паролата съдържа твърде малко главни букви The password contains less than %1 lowercase letters - + Паролата съдържа по-малко от %1 малки букви The password contains too few lowercase letters - + Паролата съдържа твърде малко малки букви The password contains less than %1 non-alphanumeric characters - + Паролата съдържа по-малко от %1 знаци, които не са букви или цифри The password contains too few non-alphanumeric characters - + Паролата съдържа твърде малко знаци, които не са букви или цифри The password is shorter than %1 characters - + Паролата е по-малка от %1 знаци @@ -1345,47 +1345,47 @@ The installer will quit and all changes will be lost. The password is just rotated old one - + Паролата е обърнат вариант на старата The password contains less than %1 character classes - + Паролата съдържа по-малко от %1 видове знаци The password does not contain enough character classes - + Паролата не съдържа достатъчно видове знаци The password contains more than %1 same characters consecutively - + Паролата съдържа повече от %1 еднакви знаци последователно The password contains too many same characters consecutively - + Паролата съдържа твърде много еднакви знаци последователно The password contains more than %1 characters of the same class consecutively - + Паролата съдържа повече от %1 еднакви видове знаци последователно The password contains too many characters of the same class consecutively - + Паролата съдържа твърде много еднакви видове знаци последователно The password contains monotonic sequence longer than %1 characters - + Паролата съдържа монотонна последователност, по-дълга от %1 знаци The password contains too long of a monotonic character sequence - + Паролата съдържа твърде дълга монотонна последователност от знаци @@ -1395,77 +1395,77 @@ The installer will quit and all changes will be lost. Cannot obtain random numbers from the RNG device - + Получаването на произволни числа от RNG устройството е неуспешно Password generation failed - required entropy too low for settings - + Генерирането на парола е неуспешно - необходимата ентропия е твърде ниска за настройки The password fails the dictionary check - %1 - + Паролата не издържа проверката на речника - %1 The password fails the dictionary check - + Паролата не издържа проверката на речника Unknown setting - %1 - + Неизвестна настройка - %1 Unknown setting - + Неизвестна настройка Bad integer value of setting - %1 - + Невалидна числена стойност на настройката - %1 Bad integer value - + Невалидна числена стойност на настройката Setting %1 is not of integer type - + Настройката %1 не е от числов вид Setting is not of integer type - + Настройката не е от числов вид Setting %1 is not of string type - + Настройката %1 не е от текстов вид Setting is not of string type - + Настройката не е от текстов вид Opening the configuration file failed - + Отварянето на файла с конфигурацията е неуспешно The configuration file is malformed - + Файлът с конфигурацията е деформиран Fatal failure - + Фатална повреда @@ -1664,7 +1664,7 @@ The installer will quit and all changes will be lost. Cre&ate - + Съз&дай @@ -1689,12 +1689,12 @@ The installer will quit and all changes will be lost. Can not create new partition - + Не може да се създаде нов дял The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - + Таблицата на дяловете на %1 вече има %2 главни дялове, повече не може да се добавят. Моля, премахнете един главен дял и добавете разширен дял, на негово място. @@ -1787,7 +1787,7 @@ The installer will quit and all changes will be lost. Boot partition not encrypted - + Липсва криптиране на дял за начално зареждане @@ -1819,7 +1819,7 @@ The installer will quit and all changes will be lost. Placeholder - + Заместител @@ -1866,7 +1866,9 @@ There was no output from the command. Output: - + +Резултат: + @@ -2088,7 +2090,7 @@ Output: The screen is too small to display the installer. - + Екранът е твърде малък за инсталатора. @@ -2290,7 +2292,7 @@ Output: rootMountPoint is %1 - root точка на монтиране е %1 + rootMountPoint е %1 @@ -2328,7 +2330,7 @@ Output: Bad path: %1 - Лош път: %1 + Невалиден път: %1 @@ -2365,7 +2367,7 @@ Output: %L1 / %L2 slide counter, %1 of %2 (numeric) - + %L1 / %L2 @@ -2446,7 +2448,7 @@ Output: Placeholder - + Заместител @@ -2458,7 +2460,7 @@ Output: TextLabel - + TextLabel @@ -2498,7 +2500,7 @@ Output: Feedback - + Обратна връзка @@ -2583,7 +2585,7 @@ Output: <h1>Welcome to the Calamares installer for %1.</h1> - + <h1>Добре дошли при инсталатора Calamares на %1.</h1> @@ -2593,7 +2595,7 @@ Output: <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>за %3</strong><br/><br/>Авторско право 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Авторско право 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Благодарности към: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg и <a href="https://www.transifex.com/calamares/calamares/">преводачите на Calamares</a>.<br/><br/>Разработката на <a href="https://calamares.io/">Calamares</a> е спонсорирана от <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 194f9f004..5dfe06b9e 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -50,7 +50,7 @@ Blank Page - + Halaman Kosong @@ -192,17 +192,17 @@ Calamares Initialization Failed - + Inisialisasi Calamares Gagal %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + %1 tidak dapat terpasang. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi. <br/>The following modules could not be loaded: - + <br/>Modul berikut tidak dapat dimuat. @@ -1665,7 +1665,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Cre&ate - + Mem&buat diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 11476558b..7acd733f0 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -1696,7 +1696,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - % 1 üzerindeki bölüm tablosu zaten% 2 birincil bölüme sahip ve artık eklenemiyor. Lütfen bir birincil bölümü kaldırın ve bunun yerine genişletilmiş bir bölüm ekleyin. + %1 üzerindeki disk bölümü tablosu zaten %2 birincil disk bölümüne sahip ve artık eklenemiyor. Lütfen bir birincil disk bölümü kaldırın ve bunun yerine uzatılmış bir disk bölümü ekleyin. From 9055a55e23e2731768f79476b7afaac2c52e5c01 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 12 Sep 2018 05:01:23 -0400 Subject: [PATCH 08/18] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calamares.desktop b/calamares.desktop index 5b73cecf3..3cdce6888 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -21,7 +21,7 @@ Name[be]=Усталяваць сістэму Icon[bg]=calamares GenericName[bg]=Системен Инсталатор Comment[bg]=Calamares — Системен Инсталатор -Name[bg]=Инсталирай система +Name[bg]=Инсталирай системата Icon[ca]=calamares GenericName[ca]=Instal·lador de sistema Comment[ca]=Calamares — Instal·lador de sistema From 5291072cbca30ea53c22362b1a7818a7ffd75413 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 12 Sep 2018 05:01:25 -0400 Subject: [PATCH 09/18] i18n: [dummypythonqt] Automatic merge of Transifex translations --- .../lang/bg/LC_MESSAGES/dummypythonqt.mo | Bin 585 -> 1099 bytes .../lang/bg/LC_MESSAGES/dummypythonqt.po | 10 +++++----- .../lang/tr_TR/LC_MESSAGES/dummypythonqt.mo | Bin 997 -> 982 bytes .../lang/tr_TR/LC_MESSAGES/dummypythonqt.po | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo index 348cc26294c8cb7f4ad5b1d04b0a3c36757650f5..a0e18658239166305fff5dcecc7d58ea6501b460 100644 GIT binary patch delta 685 zcmb7=zb`{k6vuC=U!jIZ7#L1XNZPcClynm&F=&* z(v}w`bQQ6jw;K94m`%R7jiy6G+`P~Io*(zTbI*OVzISFScI$<}>HtF^0J^~mkgEi2 z;1P^~SI`AM!2tLI{lIP!!V4XR-hx%o3%{pTh!yA{v=5qw4nxnNV?t!a9gGM96)0+| zs|7n;VXe9Ky&aakXq${oQA|yee@+Ri5f?m7SM-ENQB~8FO_es{yEK!CMpHDO(nIl> zU#Ho4&?TlL;k9j?atN7K8q!N)HMyXxJ0cKLo0K9P)(D^8H0>f;wqEVH6%Uf8q%zd0LB0n_wb$ zh;vWyOI(xzSovxd-@`eA^E0SR@MSe$GPCk8#LsLv1mDzukSWT(^#ZDo-f-rRCW5aq bK~dhp_|M%)w($HuhZa&Bu%_uVW!iI}Y7j|51ys-De4uuPQE^Jj~006n%BQO8} diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po index 011a2294f..9a404c31a 100644 --- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-07 18:58+0100\n" +"POT-Creation-Date: 2018-06-18 07:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Georgi Georgiev , 2018\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" @@ -28,16 +28,16 @@ msgstr "Нов QLabel." #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "" +msgstr "Фиктивен PythonQt ViewStep" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "" +msgstr "Фиктивната задача PythonQt" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "" +msgstr "Това е фиктивната задача PythonQt. Фиктивната задача заявява: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "" +msgstr "Съобщение за състоянието на фиктивната задача PythonQt." diff --git a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo index 57e8ac336a81599713f72037dedeced41d905e6a..6d0fa216869f1c784bc91d70ae934b332f6f25f4 100644 GIT binary patch delta 87 zcmaFLevN%Xi0Kwa28IM67GPjt5M^dyFa^?TK$;Io#{g+*Ae{}Q#ej4>kTwU>^EP&B dGxD108d@kAm|K~c=^B_!KFH{@S%m2#BLFFC4jBLd delta 102 zcmcb{{*-+}i0NTQ28IM67GPjtP+?|ZFa^@4K$;IoX9H, 2016\n" +"Last-Translator: Demiray Muhterem , 2016\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 94c244eef8b098bb33f3eb2244bafb399f8d14ee Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 12 Sep 2018 05:01:25 -0400 Subject: [PATCH 10/18] i18n: [python] Automatic merge of Transifex translations --- lang/python/bg/LC_MESSAGES/python.mo | Bin 894 -> 1371 bytes lang/python/bg/LC_MESSAGES/python.po | 10 +++++----- lang/python/tr_TR/LC_MESSAGES/python.mo | Bin 1192 -> 1177 bytes lang/python/tr_TR/LC_MESSAGES/python.po | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/python/bg/LC_MESSAGES/python.mo b/lang/python/bg/LC_MESSAGES/python.mo index f646fe6c351cae23c71cd30292ad61e924fd4c07..3198676e176cc2ee5099b14ef4aafc1643acc9a9 100644 GIT binary patch delta 626 zcmZ{f%_{_99LFClmU8fRTia7w?S>^O?zT9(xXSF#U@$YAnLTXU##<>T+fq(0T*P5k zHf!0H@(29p!a<3Pe?YGCeReiU`PKLNJkRg_`D%J@wO=}X2MpE%1t1w}gU%sguTVSm z26aInHTvs3e-Ahc-w@aj%HS}#2X=$^;2HD;h49{LU~B+91%r&)>=BnfI6lER81OL` z18r~?d;rJ5-bTjIgZZI)NSIi<8A9mCkX|*kV@=`~OKDn~C)3uVq4Omp9{ueJ>fE%H zBwx$0NkvyyB}?I&lvq@CWl)u)+2mCJ^s13iOjFetcv4C%OACt0!=Z4(NaC$e~Me+#Ni;?V^nS zX1N>grn^gbR1zhkuJ#cuOgSpRRdCm-2sw29dv!*KR2Jn3+)y!hT%VaZqI@+mPZjtt z5J9=u79$)CDTocB!hc`P1smqZX&;ksse%C_-J9)hixn`dg3ewKcLNu(g2*mL**AAW B;voP4 delta 157 zcmcc3^^dLoo)F7a1|VPoVi_Q|0b*7ljsap2C;(zXAT9)A6CiE|Vgn%F0mQ2r85mvy zX*D38%EZ8s1f=%>={O)Q&&A!85P8BrzvPp&&6iJ28E-HlyX_ Z35# X!4^o{0cjZ^U9)lJWya0jOtMS>JRuDi delta 100 zcmbQqxq@>-itAxU28QcEEXcsXFq@fyK?F#z1=5m0`Vf#70Md7Wv@wu=3#7Gyv?2=w ngDsHu1=2D=x_jfw%Zz-F8s?Og=Hz51<|RIAn7g@}Nsb8sXQ~wR diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po index cfcb8b328..4b2baad96 100644 --- a/lang/python/tr_TR/LC_MESSAGES/python.po +++ b/lang/python/tr_TR/LC_MESSAGES/python.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-18 07:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Demiray “tulliana” Muhterem , 2017\n" +"Last-Translator: Demiray Muhterem , 2017\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From f6aaa4b73a3eb74f454eb75ef4570f8631be8350 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Thu, 13 Sep 2018 17:16:35 +0200 Subject: [PATCH 11/18] .gitattributes sorted and completed --- .gitattributes | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index d7a0364e1..772fc7ad3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,13 @@ -.tx/* export-ignore -hacking/* export-ignore -HACKING.md export-ignore -.editorconfig export-ignore -src/modules/testmodule.py export-ignore +.editorconfig export-ignore +.gitattributes export-ignore +.github export-ignore +.gitignore export-ignore +.gitmodules export-ignore +.travis.yml export-ignore +.tx export-ignore + +hacking export-ignore +HACKING.md export-ignore +src/modules/testmodule.py export-ignore src/modules/globalStorage.yaml export-ignore + From 82c51dec370521d50e7452508057d5c819f6ecd3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 14 Sep 2018 05:33:04 -0400 Subject: [PATCH 12/18] CMake: don't change cmake logging on release builds - There is no real need to reduce the logging on release builds, it's just confusing that all the cmake-time output changes in a non-meaningful way. --- .../CalamaresAddBrandingSubdirectory.cmake | 6 +-- .../CalamaresAddModuleSubdirectory.cmake | 20 +++++----- CMakeModules/CalamaresAddPlugin.cmake | 39 +++++++++---------- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake index f4eb349f2..78330e245 100644 --- a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake +++ b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake @@ -79,10 +79,8 @@ function( calamares_add_branding NAME ) endforeach() message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} branding component: ${BoldRed}${NAME}${ColorReset}" ) - if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) - message( " ${Green}TYPE:${ColorReset} branding component" ) - message( " ${Green}BRANDING_COMPONENT_DESTINATION:${ColorReset} ${BRANDING_COMPONENT_DESTINATION}" ) - endif() + message( " ${Green}TYPE:${ColorReset} branding component" ) + message( " ${Green}BRANDING_COMPONENT_DESTINATION:${ColorReset} ${BRANDING_COMPONENT_DESTINATION}" ) endfunction() # Usage calamares_add_branding_translations( [DIRECTORY ]) diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake index 0b417bdf3..74ff640d9 100644 --- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -99,19 +99,17 @@ function( calamares_add_module_subdirectory ) endforeach() message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${SUBDIRECTORY}${ColorReset}" ) - if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) - message( " ${Green}TYPE:${ColorReset} jobmodule" ) - message( " ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" ) - if( MODULE_CONFIG_FILES ) - if ( INSTALL_CONFIG ) - set( _destination "${MODULE_DATA_DESTINATION}" ) - else() - set( _destination "[Build directory only]" ) - endif() - message( " ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => ${_destination}" ) + message( " ${Green}TYPE:${ColorReset} jobmodule" ) + message( " ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" ) + if( MODULE_CONFIG_FILES ) + if ( INSTALL_CONFIG ) + set( _destination "${MODULE_DATA_DESTINATION}" ) + else() + set( _destination "[Build directory only]" ) endif() - message( "" ) + message( " ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => ${_destination}" ) endif() + message( "" ) # We copy over the lang directory, if any if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" ) install_calamares_gettext_translations( diff --git a/CMakeModules/CalamaresAddPlugin.cmake b/CMakeModules/CalamaresAddPlugin.cmake index 1bf20e4ca..886501a56 100644 --- a/CMakeModules/CalamaresAddPlugin.cmake +++ b/CMakeModules/CalamaresAddPlugin.cmake @@ -62,28 +62,27 @@ function( calamares_add_plugin ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${PLUGIN_NAME}${ColorReset}" ) - if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) - message( " ${Green}TYPE:${ColorReset} ${PLUGIN_TYPE}" ) - message( " ${Green}LINK_LIBRARIES:${ColorReset} ${PLUGIN_LINK_LIBRARIES}" ) - message( " ${Green}LINK_PRIVATE_LIBRARIES:${ColorReset} ${PLUGIN_LINK_PRIVATE_LIBRARIES}" ) - message( " ${Green}PLUGIN_DESTINATION:${ColorReset} ${PLUGIN_DESTINATION}" ) - if( PLUGIN_CONFIG_FILES ) - set( _destination "(unknown)" ) - if ( INSTALL_CONFIG AND NOT PLUGIN_NO_INSTALL ) - set( _destination "${PLUGIN_DATA_DESTINATION}" ) - elseif( NOT PLUGIN_NO_INSTALL ) - # Not INSTALL_CONFIG - set( _destination "[Build directory only]" ) - else() - set( _destination "[Skipping installation]" ) - endif() - message( " ${Green}CONFIGURATION_FILES:${ColorReset} ${PLUGIN_CONFIG_FILES} => ${_destination}" ) + message( " ${Green}TYPE:${ColorReset} ${PLUGIN_TYPE}" ) + message( " ${Green}LINK_LIBRARIES:${ColorReset} ${PLUGIN_LINK_LIBRARIES}" ) + message( " ${Green}LINK_PRIVATE_LIBRARIES:${ColorReset} ${PLUGIN_LINK_PRIVATE_LIBRARIES}" ) + message( " ${Green}PLUGIN_DESTINATION:${ColorReset} ${PLUGIN_DESTINATION}" ) + if( PLUGIN_CONFIG_FILES ) + set( _destination "(unknown)" ) + if ( INSTALL_CONFIG AND NOT PLUGIN_NO_INSTALL ) + set( _destination "${PLUGIN_DATA_DESTINATION}" ) + elseif( NOT PLUGIN_NO_INSTALL ) + # Not INSTALL_CONFIG + set( _destination "[Build directory only]" ) + else() + set( _destination "[Skipping installation]" ) endif() - if( PLUGIN_RESOURCES ) - message( " ${Green}RESOURCES:${ColorReset} ${PLUGIN_RESOURCES}" ) - endif() - message( "" ) + message( " ${Green}CONFIGURATION_FILES:${ColorReset} ${PLUGIN_CONFIG_FILES} => ${_destination}" ) endif() + if( PLUGIN_RESOURCES ) + message( " ${Green}RESOURCES:${ColorReset} ${PLUGIN_RESOURCES}" ) + endif() + message( "" ) + # create target name once for convenience set( target "calamares_${PLUGIN_TYPE}_${PLUGIN_NAME}" ) From 4b87bb6f280507944dfc39f18e9ec1a21d7f9d82 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 14 Sep 2018 18:07:09 +0200 Subject: [PATCH 13/18] Git: drop non-existent files from .gitattributes --- .gitattributes | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 772fc7ad3..3b8a7f1e8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,8 +6,6 @@ .travis.yml export-ignore .tx export-ignore -hacking export-ignore -HACKING.md export-ignore src/modules/testmodule.py export-ignore src/modules/globalStorage.yaml export-ignore From e3bf9fc2204427b1a2060043d6919aa001f15326 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 21 Sep 2018 16:19:05 -0400 Subject: [PATCH 14/18] [partition] Fix build with KPMCore <= 3.3.0 - Reported by Philip Mueller --- src/modules/partition/gui/ChoicePage.cpp | 4 ++++ src/modules/partition/gui/PartitionPage.cpp | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 17f0a95ea..abe7795c0 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -48,7 +48,9 @@ #include #include +#ifdef WITH_KPMCOREGT33 #include +#endif #include #include @@ -1185,9 +1187,11 @@ ChoicePage::setupActions() bool atLeastOneIsMounted = false; // Suppress 'erase' if so bool isInactiveRAID = false; +#ifdef WITH_KPMCOREGT33 if ( currentDevice->type() == Device::Type::SoftwareRAID_Device && static_cast< SoftwareRAID* >(currentDevice)->status() == SoftwareRAID::Status::Inactive ) isInactiveRAID = true; +#endif for ( auto it = PartitionIterator::begin( currentDevice ); it != PartitionIterator::end( currentDevice ); ++it ) diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index f23eecd6e..9d972c8fd 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -48,7 +48,9 @@ // KPMcore #include #include +#ifdef WITH_KPMCOREGT33 #include +#endif #include #include @@ -168,11 +170,14 @@ PartitionPage::updateButtons() { createTable = true; +#ifdef WITH_KPMCOREGT33 if ( device->type() == Device::Type::SoftwareRAID_Device && - static_cast< SoftwareRAID* >(device)->status() == SoftwareRAID::Status::Inactive ) { + static_cast< SoftwareRAID* >(device)->status() == SoftwareRAID::Status::Inactive ) + { createTable = false; create = false; } +#endif } else { From 8178c82d11b0aa52c9e8ec2aeae797dc2462361c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 21 Sep 2018 16:21:30 -0400 Subject: [PATCH 15/18] Changelog: update with names & partition module --- CHANGES | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index 56526aad2..8c56b4023 100644 --- a/CHANGES +++ b/CHANGES @@ -6,11 +6,17 @@ website will have to do for older versions. # 3.2.3 (unreleased) # This release contains contributions from (alphabetically by first name): + - Alf Gaida + - Caio Carvalho + - Philip Mueller ## Core ## ## Modules ## + * The *partition* module supports RAID devices, but only when Calamares + is compiled with the newest KPMCore release. + # 3.2.2 (2018-09-04) # This release contains contributions from (alphabetically by first name): From 88c973f7cc09f891c56ea0c81558c414f6c53c83 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 13 Sep 2018 05:33:39 -0400 Subject: [PATCH 16/18] [partition] Simplify space calculations - Q_ASSERT doesn't work in constexpr functions because it's not - May as well calculate bytes at compile-time, no need to give the runaround via number-of-MiB --- src/modules/partition/core/PartitionActions.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index d35345424..677c3778d 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -104,10 +104,7 @@ swapSuggestion( const qint64 availableSpaceB ) constexpr qint64 alignBytesToBlockSize( qint64 bytes, qint64 blocksize ) { - Q_ASSERT( bytes >= 0 ); - Q_ASSERT( blocksize > 0 ); qint64 blocks = bytes / blocksize; - Q_ASSERT( blocks >= 0 ); if ( blocks * blocksize != bytes ) ++blocks; @@ -135,17 +132,17 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass // the logical sector size (usually 512B). EFI starts with 2MiB // empty and a 300MiB EFI boot partition, while BIOS starts at // the 1MiB boundary (usually sector 2048). - int uefisys_part_size = isEfi ? 300 : 0; - int empty_space_size = isEfi ? 2 : 1; + int uefisys_part_sizeB = isEfi ? 300_MiB : 0_MiB; + int empty_space_sizeB = isEfi ? 2_MiB : 1_MiB; // Since sectors count from 0, if the space is 2048 sectors in size, // the first free sector has number 2048 (and there are 2048 sectors // before that one, numbered 0..2047). - qint64 firstFreeSector = bytesToSectors( MiBtoBytes(empty_space_size), dev->logicalSize() ); + qint64 firstFreeSector = bytesToSectors( empty_space_sizeB, dev->logicalSize() ); if ( isEfi ) { - qint64 efiSectorCount = bytesToSectors( MiBtoBytes(uefisys_part_size), dev->logicalSize() ); + qint64 efiSectorCount = bytesToSectors( uefisys_part_sizeB, dev->logicalSize() ); Q_ASSERT( efiSectorCount > 0 ); // Since sectors count from 0, and this partition is created starting From 0396ed28b7c65325aafd67296ca2509175da0dbd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 Sep 2018 17:05:36 +0200 Subject: [PATCH 17/18] [keyboard] Update some origin information for the keyboard map --- src/modules/keyboard/kbd-model-map | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/keyboard/kbd-model-map b/src/modules/keyboard/kbd-model-map index 8555adfdf..68c8baf72 100644 --- a/src/modules/keyboard/kbd-model-map +++ b/src/modules/keyboard/kbd-model-map @@ -1,6 +1,11 @@ # Copied from systemd-localed -# http://cgit.freedesktop.org/systemd/systemd/log/src/locale/kbd-model-map +# +# https://cgit.freedesktop.org/systemd/systemd/log/src/locale/kbd-model-map # (originally under LGPLv2.1+, used under the LGPL to GPL conversion clause) +# +# This is the version from 534644b7be7b240eb0fbbe06e20cbecbe8206767, +# committed 2015-01-22 01:07:24 . +# # Generated from system-config-keyboard's model list # consolelayout xlayout xmodel xvariant xoptions sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp From d752223d0bc72adcce8f1db8473570253bb91651 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 Sep 2018 17:58:22 +0200 Subject: [PATCH 18/18] [libcalamaresui] When reporting failure, use full product name. --- src/libcalamaresui/ViewManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 2b9f87db8..4d1f3591e 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -191,7 +191,7 @@ ViewManager::onInitFailed( const QStringList& modules) detailString = details.join( QString() ); } - insertViewStep( 0, new BlankViewStep( title, description.arg( *Calamares::Branding::ShortProductName ), detailString ) ); + insertViewStep( 0, new BlankViewStep( title, description.arg( *Calamares::Branding::ProductName ), detailString ) ); } ViewStepList