X-Original-To: alpine-devel@lists.alpinelinux.org Received: from mail-qt0-f176.google.com (mail-qt0-f176.google.com [209.85.216.176]) by lists.alpinelinux.org (Postfix) with ESMTP id 31C1C5C4FC9 for ; Sat, 29 Jul 2017 03:53:34 +0000 (GMT) Received: by mail-qt0-f176.google.com with SMTP id 16so48369738qtz.4 for ; Fri, 28 Jul 2017 20:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dereferenced-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Pkjl/ldPJMW8qb4QIko9U3LFlpYuunbKcyBIZ5Ax5d0=; b=0UMN4WPNAjx9eIf7PXohH/YFHvia8mMIhaO+pMU0pq23ERfTnngP8C/jgzGT8j+FC+ rZhBr9i9pjo3jhiEwIAtnt4eIwu67+pKt1YC3/kz7q8hEF+yJVmTzpmTFfITypgpZDIT ueTXj2JLG7a//ThZnBTsWznswLgIAHLaHaelAkQem5SIVgf0sAA+jmSlLf6SbB76XSLL q3Ng5Ui4Eo0GFgtDoTO05nVzm2UP9jyfSP9O6r0vFbbbuHHmKZ8DESGhB1QExA3V8Tgm +dg2JviYzrDeQ6op1SjNqHXPhKKY+NzAi7Hr8m+z8nVXlZSBFRTm/JAraeGu9tFPS8T5 /ddg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Pkjl/ldPJMW8qb4QIko9U3LFlpYuunbKcyBIZ5Ax5d0=; b=Nvy0sBhku2hkDpnwFuUT+XyZPjImtsaLWL1DUQy5+93y6OHShWBt/Mp64YQWr0Kmo9 6nw5lzHP8DLagIVKnYzhIBJxLrwuOsZPDLIkFXhvC/p2UKKRkHE0W6RozZI+DZ9uyCyp Tf5Yf3IlQi9Xgime/I9GMsQXPH+0iadR29KGZLekUY4ZPNhlh8nGxw1xmB57tDj6QpWl gkKHpl/mbt/Wm15qa0fpMrBWWxC7+4w3O37SwTVU1WT6XWicWgjuwSLU9QODTujKNhSr mrwUJHITysXSrL5YNsGBCyKTQCMgweVWtL6MZtFpSuVJinyA5mh2sYCiJtDCkrkzJVjD r9CA== X-Gm-Message-State: AIVw1137G6rdsngAIVOz3Z6+0NiCq2ChCKDTiLZT+0qVLRXBJlJOp1NY oao1iW7vnwc9U55/bn2+4ar0RVdcDP8P X-Received: by 10.200.36.156 with SMTP id s28mr13007068qts.277.1501300413917; Fri, 28 Jul 2017 20:53:33 -0700 (PDT) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Received: by 10.200.46.10 with HTTP; Fri, 28 Jul 2017 20:53:33 -0700 (PDT) In-Reply-To: <20170728232022.24444-2-awilfox@adelielinux.org> References: <20170728232022.24444-1-awilfox@adelielinux.org> <20170728232022.24444-2-awilfox@adelielinux.org> From: William Pitcock Date: Fri, 28 Jul 2017 22:53:33 -0500 Message-ID: Subject: Re: [alpine-devel] [PATCH apk-tools 2/2] index: Only rewrite arch if no error is encountered To: "A. Wilcox" Cc: alpine-dev , "A. Wilcox" Content-Type: text/plain; charset="UTF-8" Applied, thanks. William On Fri, Jul 28, 2017 at 6:20 PM, A. Wilcox wrote: > From: "A. Wilcox" > > --- > src/index.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/index.c b/src/index.c > index 45d371b..4dd69cb 100644 > --- a/src/index.c > +++ b/src/index.c > @@ -192,9 +192,9 @@ static int index_main(void *ctx, struct apk_database *db, struct apk_string_arra > errors++; > } else { > newpkgs++; > + if (ictx->rewrite_arch != NULL) > + pkg->arch = ictx->rewrite_arch; > } > - if (ictx->rewrite_arch != NULL) > - pkg->arch = ictx->rewrite_arch; > apk_sign_ctx_free(&sctx); > } > } > -- > 2.10.0 > > > > --- > Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org > Help: alpine-devel+help@lists.alpinelinux.org > --- > --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---