From patchwork Fri Mar 18 13:22:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 552608 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp2077535mag; Fri, 18 Mar 2022 06:31:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZmt7TDQrll4gfBy7roNKIyV65nq6aYAg4ZHK++HqYKdo9axdX3B12EnsF4w+0molo4pJw X-Received: by 2002:ac8:5dd2:0:b0:2e0:688f:ba8f with SMTP id e18-20020ac85dd2000000b002e0688fba8fmr7271965qtx.139.1647610269834; Fri, 18 Mar 2022 06:31:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647610269; cv=none; d=google.com; s=arc-20160816; b=AESPimNrtiifcbmd0HIk+caigHplTm7HXvi0hOaNRNa8XCjcXquuxuSMoNHTebzo2U K3aBnZph19Y5nTy8bW3hh0Bm2IUqXNJnJ8xNZRbgG+6YzRCE4NDXjPW6U2vO0oLuoDOs M5ocvSM+W5v038vWx47DvFiCwCMQFkHDpvIlgXWYzpNBTeLDrPjiesk5rtoJcipiwcsB peEJqABKTlaoMHBpxmGPMg1MaB/xSx/SZ5m1wlWZ33HuiP6geWtE9sHQ6tNq/TMaPGe6 hJrqBFre1igaiG4ODMA6PmdrAyIIjRPwCrsn0ujeHCrrXMzE0YjuxK020e39J2G1I53n Mvxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=DEWExO7QLDaNCo9Eg6pGlE4QUxy0uT2YlPbVNfGUVoE=; b=yVKDoxaZ1PRrilVkCIannUVlUG7weUNk1wG2J5WTF9ovW1wUFBxGyQZMWt41wPXiPd qHKPzloR252YmAKmESUKbuHoLnvYm1yZNxEDbDI5kwlNZvi0R7gB9P6CFG6keAe107/M BMzWASXHDcfDxSwv9JJp7iOFik457KqxWqh57dM0Od+zDlg5TyMSNeftWpOw8L+qt7yz ddEoz3xD+JOM0wKLb0zRAmhvPrWQbVjs46Zo8lJAkrbFbrfu91TOR7XMqXtuF06PoeFV VJZA33rh/eZg2zg6exz1h1jXxBjSDoUuI3VgGCygdOHHX8LNZhOWzFMCtI50GGMCk+Pk irOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f60ua8If; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x17-20020a05620a259100b0067b315b2f79si2407690qko.500.2022.03.18.06.31.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Mar 2022 06:31:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f60ua8If; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVChB-0001EL-EZ for patch@linaro.org; Fri, 18 Mar 2022 09:31:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVCZb-0006H2-Lt for qemu-devel@nongnu.org; Fri, 18 Mar 2022 09:23:19 -0400 Received: from [2a00:1450:4864:20::32e] (port=55235 helo=mail-wm1-x32e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVCZa-0002B7-6t for qemu-devel@nongnu.org; Fri, 18 Mar 2022 09:23:19 -0400 Received: by mail-wm1-x32e.google.com with SMTP id r64so4832536wmr.4 for ; Fri, 18 Mar 2022 06:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=DEWExO7QLDaNCo9Eg6pGlE4QUxy0uT2YlPbVNfGUVoE=; b=f60ua8IfJNIfApX6NdqmL1eKNVwWpHG0T7BPhatNAsINzbmjr556JnNKLE2cUcAWxW oB85aA4q/HwApTkXOWFTR3wFKVU+UOChaBFuVUacvKqdedRs//8MuUrXqIQOnP4+RcJA Oe3PvJWc6Sc/U/rmQJGpL6JggH9o1r3NMZsEUlnBsjBYNk5/yy0Do2umB32LWMDCcMhV i2fZ4AaIxbu9SLkzp4dFmBSdiluVQljHPQz9V9bBMRW/MESLS6SAK09dYKHuUPyrpL5G kvRFLEwM/p0B6BPLuEy+Kte5Wbsg7Cg+8oirXaom71X4q9YxML2x7Rv7wXJGk0ainPyy 8XsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DEWExO7QLDaNCo9Eg6pGlE4QUxy0uT2YlPbVNfGUVoE=; b=g6tCMF5C4zrBO8fNXEAYEf4dEufAyavRzv3RLZh29e4n9tqnyOv3JlevrJ5dl/YGi2 L/JK43IJOhCyoxQlpypWuNGK4FVWgnv4+CJDR/yJUE35tJVWXIueeaA7N1IY6Q6cgZtO /heK0b0gueRjim6a2Jx2FIcHfV1ma07AzNUp4agLoyLwmO0KQraAQS+KUGPoNhCVKNOX +uVoTdhtUd5vhQgpAtaZ8dAjVFPA3WThRQcWZ0AUiyWvepifNfgh5o0cbSr5wo4qnlaw CQMkmlPsO/4+1ozlRf5ZCTBjvzTerU02WZGAEx0sm5YCD06S9BQ/F9apI8xX9pJ4sjMj 6vHA== X-Gm-Message-State: AOAM531rB01pPXbs9uA8h6+Ae6lWWZmIQ9f1FtjuLeNniLaF0xVCstXI 3phupk/pdrr92YNvwiY9mpWPPw/Ln3fHcQ== X-Received: by 2002:a05:600c:1d81:b0:38c:c1f:16a6 with SMTP id p1-20020a05600c1d8100b0038c0c1f16a6mr13752219wms.15.1647609796700; Fri, 18 Mar 2022 06:23:16 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id y15-20020a05600015cf00b00203e324347bsm6316599wry.102.2022.03.18.06.23.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 06:23:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/21] nsis installer: List emulators in alphabetical order Date: Fri, 18 Mar 2022 13:22:51 +0000 Message-Id: <20220318132306.3254960-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220318132306.3254960-1-peter.maydell@linaro.org> References: <20220318132306.3254960-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We currently list the emulators in the Windows installer's dialog in an essentially random order (it's whatever glob.glob() returns them to, which is filesystem-implementation-dependent). Add a call to sorted() so they appear in alphabetical order. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Weil Reviewed-by: John Snow Message-id: 20220305105743.2384766-2-peter.maydell@linaro.org --- scripts/nsis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nsis.py b/scripts/nsis.py index 5135a058316..383bef70332 100644 --- a/scripts/nsis.py +++ b/scripts/nsis.py @@ -34,9 +34,9 @@ def main(): with open( os.path.join(destdir + args.prefix, "system-emulations.nsh"), "w" ) as nsh: - for exe in glob.glob( + for exe in sorted(glob.glob( os.path.join(destdir + args.prefix, "qemu-system-*.exe") - ): + )): exe = os.path.basename(exe) arch = exe[12:-4] nsh.write(