Merge branch '3.1.x-stable'

CMakeLists.txt

@@ -166,7 +166,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
 ### Bump version here
 set( CALAMARES_VERSION_MAJOR 3 )
 set( CALAMARES_VERSION_MINOR 1 )
-set( CALAMARES_VERSION_PATCH 6 )
+set( CALAMARES_VERSION_PATCH 7 )
 set( CALAMARES_VERSION_RC 0 )
 
 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )

src/modules/netinstall/NetInstallViewStep.cpp

@@ -131,7 +131,7 @@ NetInstallViewStep::onLeave()
     QVariantList tryInstallPackages;
     QVariantList packageOperations;
 
-    cDebug() << "Processing";
+    cDebug() << "Processing" << packages.length() << "packages from netinstall.";
 
     for ( auto package : packages )
     {
@@ -157,12 +157,14 @@ NetInstallViewStep::onLeave()
         QMap<QString, QVariant> op;
         op.insert( "install", QVariant( installPackages ) );
         packageOperations.append(op);
+        cDebug() << "  .." << installPackages.length() << "critical packages.";
     }
     if ( !tryInstallPackages.empty() )
     {
         QMap<QString, QVariant> op;
         op.insert( "try_install", QVariant( tryInstallPackages ) );
         packageOperations.append(op);
+        cDebug() << "  .." << tryInstallPackages.length() << "non-critical packages.";
     }
 
     if ( !packageOperations.isEmpty() )

src/modules/packages/main.py

@@ -344,10 +344,18 @@ def subst_locale(plist):
 
 def run_operations(pkgman, entry):
     """
-    Call package manager with given parameters.
+    Call package manager with suitable parameters for the given
-
+    package actions.
-    :param pkgman:
+
-    :param entry:
+    :param pkgman: PackageManager
+        This is the manager that does the actual work.
+    :param entry: dict
+        Keys are the actions -- e.g. "install" -- to take, and the values
+        are the (list of) packages to apply the action to. The actions are
+        not iterated in a specific order, so it is recommended to use only
+        one action per dictionary. The list of packages may be package
+        names (strings) or package information dictionaries with pre-
+        and post-scripts.
     """
     global group_packages, completed_packages, mode_packages