X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from dal-a2.localdomain (unknown [74.117.189.115]) by mail.alpinelinux.org (Postfix) with ESMTP id 424BEDC0091 for ; Fri, 28 Jun 2013 09:31:05 +0000 (UTC) Received: from ncopa-desktop.alpinelinux.org (3.203.202.84.customer.cdi.no [84.202.203.3]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: ncopa@tanael.org) by dal-a2.localdomain (Postfix) with ESMTPSA id 7494BBC2A97; Fri, 28 Jun 2013 09:31:04 +0000 (UTC) Date: Fri, 28 Jun 2013 11:31:01 +0200 From: Natanael Copa To: Dubiousjim Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH 05/15] reword upgrade messages Message-ID: <20130628113101.0e552bd3@ncopa-desktop.alpinelinux.org> In-Reply-To: References: X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.17; x86_64-unknown-linux-gnu) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 27 Jun 2013 15:28:50 -0400 Dubiousjim wrote: I think there have been bugs recently that has made apk perform the self upgrade at 'random'. The self-upgrade should only happen when apk-tools or one of its dependencies are upgraded. Maybe it should self-upgrade only when apk-tools itself needs upgrade. (dependencies should be ABI compat so they should not have any effect on the result) > --- > src/upgrade.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/upgrade.c b/src/upgrade.c > index 9eb7890..0d7155a 100644 > --- a/src/upgrade.c > +++ b/src/upgrade.c > @@ -64,7 +64,7 @@ int apk_do_self_upgrade(struct apk_database *db, unsigned short solver_flags) > goto ret; > > if (apk_flags & APK_SIMULATE) { > - apk_warning("This simulation is not reliable as apk-tools upgrade is available."); > + apk_warning("This simulation is not reliable if apk-tools upgrade is available."); > goto ret; > } > I think this warning will/should only be displayed when it would perform a self-upgrade. Proper warning would probably be: "This simulation is not reliable as apk-tools or its dependencies would be upgraded". Or even better, make apk upgrade ignore when an apk-tools dependency is upgraded and only perform self-upgrade when apk-tools itself only is upgraded. > @@ -72,7 +72,7 @@ int apk_do_self_upgrade(struct apk_database *db, unsigned short solver_flags) > apk_solver_commit_changeset(db, &changeset, db->world); > apk_db_close(db); > > - apk_message("Continuing the upgrade transaction with new apk-tools:"); > + apk_message("Continuing the upgrade transaction:"); > for (r = 0; apk_argv[r] != NULL; r++) > ; > apk_argv[r] = "--no-self-upgrade"; --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---