diff --git a/CMakeLists.txt b/CMakeLists.txt index bf46b4900..1c6105e38 100644 --- a/CMakeLists.txt +++ b/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} ) diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index 63f1bb6f6..347b2bf27 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/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 op; op.insert( "install", QVariant( installPackages ) ); packageOperations.append(op); + cDebug() << " .." << installPackages.length() << "critical packages."; } if ( !tryInstallPackages.empty() ) { QMap op; op.insert( "try_install", QVariant( tryInstallPackages ) ); packageOperations.append(op); + cDebug() << " .." << tryInstallPackages.length() << "non-critical packages."; } if ( !packageOperations.isEmpty() ) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 48caae6bd..bbee9c32d 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -344,10 +344,18 @@ def subst_locale(plist): def run_operations(pkgman, entry): """ - Call package manager with given parameters. - - :param pkgman: - :param entry: + Call package manager with suitable parameters for the given + package actions. + + :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