From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57637138359 for ; Wed, 21 Oct 2020 00:24:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F3CCE0A4F; Wed, 21 Oct 2020 00:24:03 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5824BE0A4F for ; Wed, 21 Oct 2020 00:24:03 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id d23so281960pll.7 for ; Tue, 20 Oct 2020 17:24:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ho7Rjq6E+0Af5n+pDGWif7h8uK3CjMB5Cmkviz9FJ2w=; b=cg8hQTSRPTVE2OGASgXED65B25eymndQJqCKFl3dlxAPWxiVxVaylxBz/y/+XUZtlS 0TyxzLRRW6JO59pUa5a6aXxfhoa+Y30HZpxtADLgD+rpjSKBy8KSUOt7LrVW1PETU1GP siUCqnI9wc0yLr45euZHdAsXwCwDAL0a1NJCt28D3japY+doRuiKL2Igr7pyAmSCxsi3 H65fLCw5+t03Ra6Q7Zhi14cG/YO33DpSWDuQ51ejsLOZgQXB4J0raJcKTPuyZZ0Xp1zm IabUmMrkmzOE5AfR3E6WvZp4G/L8Kx8ZS/zhM+kCmT8QbZ2SCyKKQnGOww9Rdyyawl4o ri6A== X-Gm-Message-State: AOAM530isSR1lHMvhyQfBCJL4+EGo6UMNRDTUJh17CkbJg3pkAac8C+i 7aPsdRXTev99n0vMZOErVlpZGOqhiXevfw== X-Google-Smtp-Source: ABdhPJxysC+GKG/kcOVoLb1lizotlLoZMPRqOTDtYF9p3iV1gcaM5QN66C83qaeA36/An/8hZfeAjw== X-Received: by 2002:a17:902:860b:b029:d3:c430:7eb9 with SMTP id f11-20020a170902860bb02900d3c4307eb9mr432153plo.9.1603239842026; Tue, 20 Oct 2020 17:24:02 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id h5sm191271pfh.9.2020.10.20.17.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:01 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 03/37] catalyst: Fix obvious logic error Date: Tue, 20 Oct 2020 17:23:10 -0700 Message-Id: <20201021002344.378131-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 13f0daf2-028b-4789-a492-a60864717da2 X-Archives-Hash: 6fb823f2d9c7314e90673d1345c6d59d Broken since 2005. I don't even know what the author could have been thinking when they changed this. Fixes: c06264e3 ("Initial import of Catalyst 2.0.0") Signed-off-by: Matt Turner --- catalyst/base/stagebase.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 532f7133..6f5aa23a 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1530,9 +1530,7 @@ class StageBase(TargetBase, ClearBase, GenBase): if not isinstance(myopts, str): myopts = ' '.join(myopts) - self.env[kname + "_kernelopts"] = myopts - else: - self.env[kname + "_kernelopts"] = "" + self.env[kname + "_kernelopts"] = myopts key = 'boot/kernel/' + kname + '/extraversion' self.settings.setdefault(key, '') -- 2.26.2