From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 5/9] pakfire: Optimize upgradecore function Date: Tue, 22 Mar 2022 15:16:37 +0000 Message-ID: <7F8C8827-E64F-4BC1-BD9E-2788CF553E7E@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1559355572435116795==" List-Id: --===============1559355572435116795== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hey, > On 22 Mar 2022, at 12:58, Robin Roevens wrote: >=20 >=20 > Michael Tremer schreef op ma 21-03-2022 om 16:24 [+0000]: >> Hello, >>=20 >>> On 9 Mar 2022, at 22:56, Robin Roevens >>> wrote: >>>=20 >>> upgradecore function should just upgrade the core: >>> Moved check if upgrade is necessary to pakfire upgrade code, >>> removing >>> code from upgradecore function duplicating codedbinfo workings. >>> Also adding more vebosity to pakfire upgrade. >>>=20 >>> Signed-off-by: Robin Roevens >>> --- >>> src/pakfire/lib/functions.pl | 47 +++++++++++++++------------------ >>> --- >>> src/pakfire/pakfire | 16 +++++++++++- >>> 2 files changed, 35 insertions(+), 28 deletions(-) >>>=20 >>> diff --git a/src/pakfire/lib/functions.pl >>> b/src/pakfire/lib/functions.pl >>> index 1e2729485..6287367f5 100644 >>> --- a/src/pakfire/lib/functions.pl >>> +++ b/src/pakfire/lib/functions.pl >>> @@ -735,35 +735,28 @@ sub setuppak { >>> } >>>=20 >>> sub upgradecore { >>> - getcoredb("noforce"); >>> - eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); >>> - if ("$core_release" > "$Conf::core_mine") { >>> - # Safety check for lazy testers: >>> - # Before we upgrade to the latest release, we re- >>> install the previous release >>> - # to make sure that the tester has always been on >>> the latest version. >>> - my $tree =3D &get_tree(); >>> - $Conf::core_mine-- if ($tree eq "testing" || $tree >>> eq "unstable"); >>> - >>> - message("CORE UPGR: Upgrading from release >>> $Conf::core_mine to $core_release"); >>> - >>> - my @seq =3D `seq $Conf::core_mine $core_release`; >>> - shift @seq; >>> - my $release; >>> - foreach $release (@seq) { >>> - chomp($release); >>> - getpak("core-upgrade-$release"); >>> - } >>> - >>> - foreach $release (@seq) { >>> - chomp($release); >>> - upgradepak("core-upgrade-$release"); >>> - } >>> - >>> - system("echo $core_release > $Conf::coredir/mine"); >>> + # Safety check for lazy testers: >>> + # Before we upgrade to the latest release, we re-install >>> the previous release >>> + # to make sure that the tester has always been on the >>> latest version. >>> + my $tree =3D &get_tree(); >>> + $Conf::core_mine-- if ($tree eq "testing" || $tree eq >>> "unstable"); >>>=20 >>> - } else { >>> - message("CORE ERROR: No new upgrades available. You >>> are on release $Conf::core_mine."); >>> + message("CORE UPGR: Upgrading from release $Conf::core_mine >>> to $core_release"); >>> + =20 >>> + my @seq =3D `seq $Conf::core_mine $core_release`; >>=20 >> Can we remove this shell command call? This should be easily replaced >> with native Perl. > Strange.. I can remember I changed that to > ($Conf::core_mine..$core_release) .. must have gone lost somewhere in > my drafts. > I will change it. Okay. Thank you. >=20 >>=20 >>> + shift @seq; >>> + my $release; >>> + foreach $release (@seq) { >>> + chomp($release); >>> + getpak("core-upgrade-$release"); >>> } >>> + =20 >>> + foreach $release (@seq) { >>> + chomp($release); >>> + upgradepak("core-upgrade-$release"); >>> + } >>> + =20 >>> + system("echo $core_release > $Conf::coredir/mine"); >>> } >>>=20 >>> sub isinstalled { >>> diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire >>> index f23110cf5..2fb9adce7 100644 >>> --- a/src/pakfire/pakfire >>> +++ b/src/pakfire/pakfire >>> @@ -266,7 +266,21 @@ >>> $use_color =3D >>> "$Pakfire::color{'lightpurple'}"; >>> } >>>=20 >>> - &Pakfire::upgradecore(); >>> + &Pakfire::message("CORE INFO: Checking for Core >>> updates..."); >>> + >>> + ### Make sure that the core db is not outdated.=20 >>> + &Pakfire::getcoredb("noforce"); >>> + my %coredb =3D &Pakfire::coredbinfo(); >>> + >>> + if (defined $coredb{'AvailableRelease'}) { >>> + &Pakfire::upgradecore(); >>> + } else { >>> + &Pakfire::message("CORE WARN: No new Core >>> upgrades available. You are on release ".$coredb{'Release'}); >>=20 >> Here, the Core Update is being called Core Upgrade. That might be >> coming from somewhere else. In the end we should probably reword lots >> of the error messages to make them consistent and easy to understand. > Yes, also "pakfire update" vs "pakfire upgrade", possibly the reason > why it is called "core upgrade" here. > Should I change everything to 'update' ? No, this is a little bit similar to apt-get which has an update and an upgrad= e command. That was the intention at least. I would just change the name =E2=80=9CCore Upgrade=E2=80=9D to =E2=80=9CCore = Update=E2=80=9D because that is what we call it. It is only an aesthetic chan= ge. > But then I think it would also be more clear if 'pakfire update' would > update the system instead of only the pakfire db? > So maybe we can 'rename' 'pakfire update' to 'pakfire refresh' and then > rename 'pakfire upgrade' to 'pakfire update'... (possibly keeping > 'pakfire upgrade' as an alias for 'pakfire update' for some backward > compatibility) This would break people=E2=80=99s scripts, so I wouldn=E2=80=99t say this is = worth it. > I'm a bit reticent about this as it changes the existing meaning of > 'pakfire update' but I think that it would be more consistent in the > end ? >=20 >>=20 >>> + } >>> + >>> + &Pakfire::message("PAKFIRE INFO: Checking for >>> package updates..."); >>> + ### Make sure that the package list is not >>> outdated.=20 >>> + &Pakfire::dbgetlist("noforce"); >>> =20 >>> my @deps =3D (); >>> if (my %upgradepaks =3D &Pakfire::dblist("upgrade")) >>> { >>> --=20 >>> 2.34.1 >>>=20 >>>=20 >>> --=20 >>> Dit bericht is gescanned op virussen en andere gevaarlijke >>> inhoud door MailScanner en lijkt schoon te zijn. >>>=20 >>=20 >>=20 >=20 > --=20 > Dit bericht is gescanned op virussen en andere gevaarlijke > inhoud door MailScanner en lijkt schoon te zijn. --===============1559355572435116795==--