From patchwork Thu Jan 18 17:35:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3308 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 Jan 2024 18:35:18 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f61.google.com (mail-oa1-f61.google.com [209.85.160.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40IHZHca009234 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 18 Jan 2024 18:35:18 +0100 Received: by mail-oa1-f61.google.com with SMTP id 586e51a60fabf-210cc863309sf400345fac.1 for ; Thu, 18 Jan 2024 09:35:18 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1705599312; cv=pass; d=google.com; s=arc-20160816; b=djiNNpIq5CPpfUvEgpulBI3UKG/DC9jERnlatvmBbjjGFueZDskKGaoebhhsGLt+Xa uOHkKa1fVX/zfbqblM0+IjWsEuFCTE48NZRLMVL9UitN7H0UgxlM3oWWg10Fpm6tiIxN 85JiVLR8WnrF2AP5nWbQt+AqD6Zr9eGGlBHWoYIhGiLIWPdeN53crAkECJFYnCfV9Z/Z acBkrAqjca/zH/fZ6iX4Sdl7EsdqpWQVZ7RNJ4H60hhWfiBMffQrEPRB71oBDMKE/LBX QbSR00fNhc5VpWtTy2qknTLk6L9en0kWvHKSMhuR05HomayQ7dmTNlaemsgcjZ/NFrSg PQxw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version :content-language:subject:to:from:user-agent:date:message-id :dkim-signature; bh=ddndmoAG1Xj53wTCnBL4MPTuqFH7nd53nRMCxFot7xw=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=JYAF41ZlJ/wWJdYiDL9SvQWi7P4SZLDqW9+VIucgze/mnXNclLgMt4kizazOuFsvRR Oa0QZQsREJQqBZlgQQr+h2iistB1NJALlGMdVd7Q+t/5czMELxum8vToQD4X84y0m1+3 gEL0IotYWrpfnOxGiUWE/qulCaNQ3Juc0I38m5a2weXvMz7JSc0DfVcmwzwijVRHxJV3 HJAS0KOvROKmG2PhJspSi+2Vbv1dB+pUj5AouHCygOGdGemHJ1XDOiUOkyeU4TF4zCcw 7Bbk1NB7vuvae2zzDCtoLKlXAyMaek7WA40vmtBYf4Q9Jh/4mugxwO6PVq19ctflMTZL 941A== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B8yj7CUQ; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1705599312; x=1706204112; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-language:subject:to:from:user-agent:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=ddndmoAG1Xj53wTCnBL4MPTuqFH7nd53nRMCxFot7xw=; b=AhEpEu031ve8kMQ+PtdE5UuIZBb3wx/EXk0dVKMqxC5i7UsIVJZLw+9iN6a/L5jjdk iCHWB5ftb3IBtWPxz84YJIuIZClfHYTIKfa56Z0JKKYWKFSt1Q6zVLloUepa2OBXzfFR snG8w6deToLAB0RALw2kc+4/XAH5WJH/IVv9Bs1S9fQrhR1HywNB9l5fDU3PMK/oWpDa WG2DKpCs4JjIl4iS5e1bw3jgfjsFvZeyv+amggOdGWJHcFG7hXY0eUFoJjZpjGJOoJqP lw0hmJuI4OssCn7q+fpjhFfiwkXitmp70nyLHrSygIRBi/qgWV6BEowxoiywYGNqMm6X 2zoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705599312; x=1706204112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-language:subject:to:from:user-agent:date:message-id :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ddndmoAG1Xj53wTCnBL4MPTuqFH7nd53nRMCxFot7xw=; b=f8ZDIDhGHU/eVvFDTC2wtcxPp9Z7Ou+apRNsf8cLWHntyFonjnknzdbS3mupdBxaal 7EaUv+69ycLHVrzwZIvoKVPxIFa9bmdIWCc6Z0+Gpdsm2aZbhNWtaLqheNtECrhhLW7v APRfAEHZdf3Tv/3dwH9iUF1+Z83VYVCDAjw0mdvpmZn145inFoStC321VRZDCLb5M/Eg gx+s6kJeyL6wllABBTLLWFZdfYWEUf23H8sRLSBdX5diXSO+xDRtwiclhP4i2cMKDYWl ERzdWh641C0KMmksvDawU2FOat5GbB2dsNjpsW9MOlbCaArjKYB1uNqqUATiElGqn0cD 9AWw== X-Gm-Message-State: AOJu0Yw/ZKvVHiKpdn8R6L450oU6F3eGo+fvzNMSfbhKKAWBWGBG4C9S syEbuNxRNMfzKtPy59o/GRr92Blr8/IIAYLfVMx7BaJh+xZiM8xR X-Google-Smtp-Source: AGHT+IHeES20eoN2piN5SxwHAO2dcCkoqhB7aR7467VBL+d7Hyn2JdPFUTYxm4DQcuX+puRUELH6mA== X-Received: by 2002:a05:6871:814:b0:210:8a34:ee25 with SMTP id q20-20020a056871081400b002108a34ee25mr1337468oap.2.1705599311705; Thu, 18 Jan 2024 09:35:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:6592:b0:210:a349:1300 with SMTP id fp18-20020a056870659200b00210a3491300ls239172oab.2.-pod-prod-04-us; Thu, 18 Jan 2024 09:35:10 -0800 (PST) X-Received: by 2002:a05:6359:2ea3:b0:176:1227:873f with SMTP id rp35-20020a0563592ea300b001761227873fmr1244177rwb.50.1705599310663; Thu, 18 Jan 2024 09:35:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705599310; cv=pass; d=google.com; s=arc-20160816; b=DXYqSlkP9nbAjEboyk7SSVklxvUlUIcry5kr76EtHFoxv5NaDzztxjim8SgFLfckqD xZi+W8giaDAnxeK3yl0rfCWF1yOBSlt17iGPB6sV36pGTS/X01QDBiBQcpMu5hhsHysg ufiLOP7Wwn/XyZ4B1D9y2F81wg3K6EEwS0TzhB0riBSdIkY0gZ4rn241A5s9LoQXoUJh RXppEBokv+M5qA+3Ct75evBWaOiWSe8+kVXBNDkrbqLPRJA5Iz8QRpwCyv2KqF9LSpjL C5DZIuzn5SRkFC17zxDL7xw7ol6EXEH/y3a8+Wvbwp2b9+gJLRoaXyelWXL0bo2bIJJw nkDg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language:subject:to :from:user-agent:date:message-id:dkim-signature; bh=DGu/aJHhgAXK5hRZzIXrJJUsV/V0ayfl2kIxe9onkrU=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=kYSksnTJwxVaHCAu/mwSMhokXLzaSw9BMcRXtPRCl+xRo78Hl9Z4iRFIdoYcR34Ri4 3Zl8TZtnL8ToFLhC6EQbPYyYKsLxE9iPfiRUsRH324lfv9+QY6Q/VgLTyXox/oYpVAq5 n7rewz/Ujt65/6+C+zB4aN30xASpeyGLGf7oOnqKI5yhrjBGc4XQi5KcTFmEDG2F0OlT BV2Rj1xfZQKe77AKXJuk9SdEeQoySsZv6OSIc2XuP7E6p59+ycI8bWSzdCyVYxF0GWor LdMK2sycItQipC3ikqZmusDGKHHxFru9FMgx0BQ3b/4YW92wYVPznPXD+G4I4Ho4rodi 5fyA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B8yj7CUQ; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com. [2a01:111:f403:2613::600]) by gmr-mx.google.com with ESMTPS id c67-20020a633546000000b005cd919bdadfsi178568pga.0.2024.01.18.09.35.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2024 09:35:10 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) client-ip=2a01:111:f403:2613::600; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JZaqBMUPA9fjGTRbbhKfxO5csemFJrAet0KIfZbXZGpK5M1QNT6plkLhnmEjepx1+eqVVIfhNT3+Tzm+IULHkdWhxRrC7W7HUlqem5/+VLCAZxqz89JvvDr/JN2lrD9HeAhP/m1CjqBvJyrPU+sqotUVkSmUhEoNJqF4ZSHOZnxsGqd6lAQKx66Phx6M5l9N6zVM8lKgAJfORFXS1yZZfQqJjKO3+H9tEEHqm4djuzG2jn8+VMB3+27AGm2Srvn6SFQUZCrRF+lYTpvyJTE83c2ew6fN5avNh/6aU+ej+2JGdytovj2ngW5hfbF1fPA29b6xk7ltDxhjeH5DNpnvTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DGu/aJHhgAXK5hRZzIXrJJUsV/V0ayfl2kIxe9onkrU=; b=JBd1U1RgaB06TeJv58+J1aR4bb54S5v1aAwMIpJtIykNHL4kuQG3OO/3JDaulA4Mc5mmxkXT2yF7Mhg5yCo5wv/1LDRXTUFn8AKJnWM1mOx7JYsW/P+nu43gSt7A/fZoAtiN0HG6wzt97SrbaRJJTAAv0HpiVWv5x80/Nw7X8d7F+sqoX+9sAcHtEkiumLtzw+5nHvuqmJ51YxOQan2krw6QYgwsEKdUyxMg/y9jvE+AwJrot0nRfOLoKYCrE2pEKCMx2JH4UZ1YpPFFTI8wqYzp+vfm25lpyJbfy3dh9jIAn4wL6uiFO6t6Yx+ibCLBVwqW4oCaDqc8IKZPG1xvgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS4PR10MB5574.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Thu, 18 Jan 2024 17:35:08 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe%3]) with mapi id 15.20.7202.024; Thu, 18 Jan 2024 17:35:07 +0000 Message-ID: <56cd7e53-f36b-4f9b-8c0f-703c45102ca0@siemens.com> Date: Thu, 18 Jan 2024 18:35:04 +0100 User-Agent: Mozilla Thunderbird X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH] dpkg-base: Fix and improve handling of multiple apt sources per package Content-Language: en-US X-ClientProxiedBy: FR4P281CA0161.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ba::13) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS4PR10MB5574:EE_ X-MS-Office365-Filtering-Correlation-Id: 00db758c-79fa-4a84-265d-08dc184bd061 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SV9BQZTKjxe0RVcqRuN78NNg/P+wVt+K7LbxkjqWP3+BxIfLsQzQmEnP403jf6E7E5Hi7yWdOut0LIfqVD7U/T8co8g0tKpL1whl7kdj+XO/ifHlmDrInETj0e9WIdnwquYQzen35+yV5OGEBjCWcKcVPjQqTdtObdjBEaCD0iye7zBNIF5UIrTMpfSNYg0OZLSj0tb+VexJ9CS96v9t57gQJ7DYM0l6nqn84TRSNDaZTGINg+mbY3eD4Kv5AophAwG+TVNPa0+n+VuwVoLPUprHcysjj2PCrtj9em6ZijQwfPKnolirT4ugwe/caEEv6iK9zWaiKekjUmjSrqipsOWgw3a+R7yFJ023b5+ihXi8GF78LTDXE63uW7fCmcCZDox6EzuGI4rupox8kxjshsVEQtUupSugx/vgwADKz6BEUR85Bh9/I1LhUuJM4LoD3QGEvVkn/N/ABB1Xh2NuvSoDqFHroEjjfSuTX8gMyMC2QXK52pMxiGpEn/8YGVwx79x9sY9j7kc6WINC3XMCRG8ag/gzbRyug+D03mcxyabXpLldpV3esAFw7ALuhHyL+nLGw2vckDrCU5xrFWg3icUp/0n5adwnshFN9TtrmJ5n1Y1klgGNalKcHyQpSu97lyfHmWxx5eaFn0ouGU09DQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(366004)(136003)(396003)(39860400002)(230922051799003)(451199024)(64100799003)(186009)(1800799012)(38100700002)(2906002)(44832011)(5660300002)(36756003)(41300700001)(82960400001)(31696002)(86362001)(6486002)(966005)(478600001)(26005)(6506007)(6512007)(6666004)(2616005)(8936002)(8676002)(83380400001)(6916009)(316002)(66556008)(66946007)(66476007)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?AHafqP/u5nnPUOQiv7Z0daBQHECI?= =?utf-8?q?trzHMDcfEVwcW0hJCoMNh2rEIEwJszUuyHk3bujuPPdgYD1T/prL0L7a60i5AUzKL?= =?utf-8?q?H6xdLu7E6odPizzyOBrWhA8ho7tkqfdwNXiVYazWPa7vgTlUdp6RTjmj5ZlHBheHl?= =?utf-8?q?u75C8r0KlzVHBNoIXe79or1bjg3IyS/1cdhFEKC5/hT63lgzWrCYgsry0cyiyzB9p?= =?utf-8?q?x1bRnLBOZeGiU0sS17v1HjJTOFpJ22jS1wxU5l0NanG4m3gTa/Jk9VA2rC4vN44GA?= =?utf-8?q?a/eBe/6UX0hf5gVuKhEsWeV2D6XLaQHcp6yqfYyDe6FQEO2rZOaUHojm0PCzVbpNx?= =?utf-8?q?5/CfgglgDR+BkVx+751mwCOsPyQPm0eVG4smkOH0LjZ6X+d/9ewv6a3cDNZaJZTwP?= =?utf-8?q?x1IdA3sLfhVRU0IWbRBaUsyZP6YyVyGfE6W6giPxOTM4YNyJSEoUMy900Fg6tqpaG?= =?utf-8?q?fkjo9SIJ1WBEeUt4njHleYj93x6YZi9MHOqFJMmYtXv/GqHrnsjEeMoSLBJ9oEv2F?= =?utf-8?q?Md2tdGygDZWpdZ/LcoNgJ6ldK5psifbU10ElalXIcj+fYUOSeuVi9M5t77I6NHxqP?= =?utf-8?q?56K9kND9ZMDwHcVEuNryxgyQkZGvM49kUZ56axIM09+DXd4WFC843CHhH9YaDgX3A?= =?utf-8?q?Z3stbfMBFlq7TMbAWir555sWvwtxmYodz0p0CB/dZNDFo+wTSVUg8Re7Skn1YQD7q?= =?utf-8?q?16/kbMm9Qv1cmdeoueyjs9Nwzj4CrSAY5jgqWfBnEFqEldlO8tFVE1kv3qewdHmr6?= =?utf-8?q?iDtaCqBpzTUOvb9O0kCOgwPq1rh3dKbdIwSFrNaaMgaFizMHqhC9spLGWMmutk0Fi?= =?utf-8?q?LnSVU+d3nqeOmqAJFVJw+diTKxdRQ+MYKsAoq4V62Z5L0OWqwGLIIgjFQ3YL/xEA9?= =?utf-8?q?YExjPOLaT4skrlFwc7ZA+FRvecTKHTe+qYGZkmU8q7K0MnN/i+qAdjJDQRtF7zq90?= =?utf-8?q?pTc1EadR9JTLubQEj5wQ7yOijBeomhS6Vk3Rko1iheaeiuFmSoapvFXOim0Z+X1lB?= =?utf-8?q?fiKzir+6l797K5EaIbygI9qOf6SqrE+F2sFChOvAcuKVkVRETYXjtZbmOMSf01o/E?= =?utf-8?q?v4LYY0/uwJR3+ScYip6j8c1B+EjAqNrzGNCr5XY734bfaPHi6G3oDE/PwsV9QVIxx?= =?utf-8?q?RVUX5JrkOErjFvJ3SycK6LoUxwqQI1JdEV5rOQOCWfwAGhx3v9dNYVNDp3123EhQR?= =?utf-8?q?AXthLudDjnVqAjAeAe5Hgjj1IbIRtskOqzxposmGw8xbEZeggGXK/04zB35iWgNIT?= =?utf-8?q?y3w708rD3z4U/oExzX/yopyysJH2MLeHkjIRovFemivS0QLYPpQhxeMtxL36A+6NX?= =?utf-8?q?hzpuR593F70c8vbGEiigYXjmFXtO4Y2XRn8LYu2phf0Qv9d8i9G9DWH9S6u+dJADi?= =?utf-8?q?qUgHDCUvYmAQDV5z+2X4/O/JWQre5B0Fg+HghMEYCClFb1Ytn7dVC3ctXjMbCHhWf?= =?utf-8?q?AEMthsNx7xguyW4Q1QS8OaWoFYqjX99Z7Gs/4/Pvp4Fb/3j1ZVlankpyOyuaqIcWQ?= =?utf-8?q?5STO9k5Xr4pY9giCbqUClwyFARBgO7Fqhg=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00db758c-79fa-4a84-265d-08dc184bd061 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2024 17:35:07.8734 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QWOfBPdUnZ0CeIzCoPCQFj58CzxANEFHS6fzizA2HJqagBGK5lfawNkMut7tSoBJ34MwhbVbl9Hm7a1sWHLQBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5574 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B8yj7CUQ; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Due to overeager quoting, multiple entries in SRC_APT would have led to build errors, rather than mulitple invocations of the fetching and unpacking steps. While fixing that, also avoid pointless re-entries into the schroot by simply pulling the loop into it. Signed-off-by: Jan Kiszka --- This goes on top of https://groups.google.com/g/isar-users/c/k8ZNw3OkWLw/m/mnzo45T0BQAJ (v6 of "dpkg: Restore support for replacing pre-installed packages in sbuild-chroot") Not urgent - this bug is by now more than 4 years old. meta/classes/dpkg-base.bbclass | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 80686677..80e31d80 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -115,10 +115,15 @@ do_apt_fetch() { schroot -d / -u root -c ${SBUILD_CHROOT} -- \ rm /etc/apt/sources.list.d/isar-apt.list /etc/apt/preferences.d/isar-apt - for uri in "${SRC_APT}"; do - schroot -d / -c ${SBUILD_CHROOT} -- \ - sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source source "$2"' my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${uri}" - done + schroot -d / -c ${SBUILD_CHROOT} -- \ + sh -c ' + set -e + for uri in $2; do + mkdir -p /downloads/deb-src/"$1"/${uri} + cd /downloads/deb-src/"$1"/${uri} + apt-get -y --download-only --only-source source ${uri} + done' \ + my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${SRC_APT}" schroot_delete_configs } @@ -139,16 +144,16 @@ do_apt_unpack() { trap 'exit 1' INT HUP QUIT TERM ALRM USR1 trap 'schroot_cleanup' EXIT - for uri in "${SRC_APT}"; do - schroot -d / -c ${SBUILD_CHROOT} -- \ - sh -c ' \ - set -e - dscfile="$(apt-get -y -qq --print-uris --only-source source "${2}" | cut -d " " -f2 | grep -E "*.dsc")" + schroot -d / -c ${SBUILD_CHROOT} -- \ + sh -c ' + set -e + for uri in $2; do + dscfile="$(apt-get -y -qq --print-uris --only-source source $uri | cut -d " " -f2 | grep -E "*.dsc")" cd ${PP} - cp /downloads/deb-src/"${1}"/"${2}"/* ${PP} - dpkg-source -x "${dscfile}" "${PPS}"' \ - my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${uri}" - done + cp /downloads/deb-src/"${1}"/${uri}/* ${PP} + dpkg-source -x "${dscfile}" "${PPS}" + done' \ + my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${SRC_APT}" schroot_delete_configs } do_apt_unpack[network] = "${TASK_USE_SUDO}"