Merge branch 'master' of https://github.com/calamares/calamares into development

CHANGES

@@ -3,7 +3,7 @@ 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.9 (unreleased) #
+# 3.2.9 (2019-06-03) #
 
 This release contains contributions from (alphabetically by first name):
  - Kevin Kofler
@@ -21,7 +21,9 @@ milestone for details.
  - *branding* allows the use of FreeDesktop.org icon names for the
    *productLogo* and *productIcon* keys. If a file is named there, then
    the file is used, and otherwise the icon is looked up in the current
-   theme.
+   theme. #1160
+ - *packages* On Arch, with the `pacman` package manager, avoid a hang
+   during system update. #1154
  - *welcome* allows a custom image path or icon name to be set for the
    language-selection drop-down (instead of the international standard one).
 

CMakeLists.txt

@@ -40,7 +40,7 @@ project( CALAMARES
     VERSION 3.2.9
     LANGUAGES C CXX )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #
@@ -104,12 +104,12 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 #       checks for new languages and misspelled ones are done (that is,
 #       copy these four lines to four backup lines, add "p", and then update
 #       the original four lines with the current translations).
-set( _tx_complete ast ca cs_CZ da de fr hr ja lt pl pt_BR pt_PT
-    tr_TR zh_TW )
-set( _tx_good bg en_GB es es_MX et gl he hi hu id it_IT ro ru sk sq
-    zh_CN )
-set( _tx_ok ar el es_PR eu fi_FI is ko mr nb nl sl sr
-    sr@latin sv th uk )
+set( _tx_complete ca cs_CZ da de fr he hr hu ko lt pt_BR sq tr_TR
+    zh_TW )
+set( _tx_good ast en_GB es es_MX et gl id it_IT ja nl pl pt_PT ro
+    ru sk zh_CN )
+set( _tx_ok ar bg el es_PR eu fi_FI hi is mr nb sl sr sr@latin sv
+    th uk )
 set( _tx_bad be eo fa fr_CH gu kk kn lo mk ne_NP ur uz )
 
 

lang/python/ast/LC_MESSAGES/python.po

@@ -347,7 +347,7 @@ msgstr ""
 
 #: src/modules/openrcdmcryptcfg/main.py:34
 msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
 
 #: src/modules/luksbootkeyfile/main.py:35
 msgid "Configuring LUKS key file."

lang/python/fi_FI/LC_MESSAGES/python.po

@@ -88,25 +88,27 @@ msgstr ""
 
 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
-msgstr ""
+msgstr "Irrota tiedostojärjestelmät käytöstä."
 
 #: src/modules/unpackfs/main.py:41
 msgid "Filling up filesystems."
-msgstr ""
+msgstr "Paikannetaan tiedostojärjestelmiä."
 
 #: src/modules/unpackfs/main.py:159
 msgid "rsync failed with error code {}."
-msgstr ""
+msgstr "rsync epäonnistui virhekoodilla {}."
 
 #: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238
 msgid "Failed to unpack image \"{}\""
-msgstr ""
+msgstr "Kuvan purkaminen epäonnistui \"{}\""
 
 #: src/modules/unpackfs/main.py:221
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 msgstr ""
+"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
+"asennettuna"
 
 #: src/modules/unpackfs/main.py:320
 msgid "No mount point for root partition"

src/modules/fsresizer/Tests.cpp

@@ -83,13 +83,14 @@ size: 100%
 atleast: 600MiB
 )" );
     j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
-    QVERIFY( j.name().isEmpty() );
+    QVERIFY( !j.name().isEmpty() );
+    QCOMPARE( j.name(), QString("/") );
     QCOMPARE( j.size().unit(), SizeUnit::Percent );
     QCOMPARE( j.minimumSize().unit(), SizeUnit::MiB );
     QCOMPARE( j.size().value(), 100 );
     QCOMPARE( j.minimumSize().value(), 600 );
 
-    // Silly config
+    // Silly config has bad atleast value
     doc0 = YAML::Load( R"(---
 fs: /
 dev: /dev/m00
@@ -98,12 +99,27 @@ atleast: 127 %
 )" );
     j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
     QVERIFY( !j.name().isEmpty() );
+    QCOMPARE( j.name(), QString("/") );
+    QCOMPARE( j.size().unit(), SizeUnit::MiB );
+    QCOMPARE( j.minimumSize().unit(), SizeUnit::None );
+    QCOMPARE( j.size().value(), 72 );
+    QCOMPARE( j.minimumSize().value(), 0 );
+
+    // Silly config has bad atleast value
+    doc0 = YAML::Load( R"(---
+dev: /dev/m00
+size: 72  MiB
+atleast: 127 %
+)" );
+    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
+    QVERIFY( !j.name().isEmpty() );
+    QCOMPARE( j.name(), QString("/dev/m00") );
     QCOMPARE( j.size().unit(), SizeUnit::MiB );
     QCOMPARE( j.minimumSize().unit(), SizeUnit::None );
     QCOMPARE( j.size().value(), 72 );
     QCOMPARE( j.minimumSize().value(), 0 );
 
-    // Silly config
+    // Normal config
     doc0 = YAML::Load( R"(---
 fs: /
 # dev: /dev/m00
@@ -111,7 +127,8 @@ size: 71MiB
 # atleast: 127%
 )" );
     j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
-    QVERIFY( j.name().isEmpty() );
+    QVERIFY( !j.name().isEmpty() );
+    QCOMPARE( j.name(), QString("/") );
     QCOMPARE( j.size().unit(), SizeUnit::MiB );
     QCOMPARE( j.minimumSize().unit(), SizeUnit::None );
     QCOMPARE( j.size().value(), 71 );