From patchwork Mon Aug 21 22:30:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: martchus@gmx.net X-Patchwork-Id: 231 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org with LMTP id UDg8JxJfm1mqDwAAtiB/HQ for ; Tue, 22 Aug 2017 00:30:42 +0200 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 6B8D2401A0; Tue, 22 Aug 2017 00:30:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.5 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Tue, 22 Aug 2017 00:30:41 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2BFA827EED; Mon, 21 Aug 2017 22:30:41 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=none Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id AD09727EDF for ; Mon, 21 Aug 2017 22:30:39 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 21 Aug 2017 22:30:39 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 67C3840123 for ; Tue, 22 Aug 2017 00:30:38 +0200 (CEST) X-Greylist: delayed 2059 seconds by postgrey-1.37 at nymeria; Tue, 22 Aug 2017 00:30:38 CEST Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for ; Tue, 22 Aug 2017 00:30:38 +0200 (CEST) Received: from localhost.localdomain ([94.217.131.189]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LZz01-1dIJ6W2wJx-00lqAM; Tue, 22 Aug 2017 00:30:37 +0200 From: martchus@gmx.net To: arch-projects@archlinux.org Date: Tue, 22 Aug 2017 00:30:17 +0200 Message-Id: <20170821223017.12115-1-martchus@gmx.net> X-Mailer: git-send-email 2.14.1 X-Provags-ID: V03:K0:bX6OPUZzxZbffVlDq9sBhugJ7XkZB6j1EcZxCM2rgwrO45anV4u mhRetHm9vLcpkhIv+vP5ouRh7s8w+UBdBc/ppchEV/Vry8+ofuokp0DrMxlYk2ZNJ9qxJ5F kuzztZngT9YD4SpRBr/XPobqRizeWd3oH95uVvs56zSXlDYI5iaYGHBNHzd4uVLOh50u7E0 RwDwjiU9rTbMNc5KemvrQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:vVYsKS6wwwA=:f2j9uoXRTu+J9wXSOJ8e6G RZ3k+t40bU1fyYXs7Kz5B82t6wLPnwJqR8iwtxuNlTQfntE37o6nIZTZ2mB5KiwDGmZvz9NZg LsI6g+drQYhyb2QFHoAOgEt992Ljgne46HDd2ONctZZEQfjA9W480lmslHI2rXF9dzBFppDvQ z1NtrrNru0JnC/EElGKnAkSJ7hNRick+FlA+iGny9xom2e2mZfYJGnsSRCn1gPO4LzuAYV6Om DhtLmRYeE1IdPo7STbB89E0ObSFyp8g7tKKVXMnIhjGYd5fXtANSujGcWj/v9SZyZ1HxjyU1L gkxzHHh5z9WYeMni0DwQji9tY/17SkHKEzr3K99DLfov9QgeZg9sXla3irt43qCoUu5vPKMuj Vf66Tk/Wl6tQRQBhrrSwKxrwuMLP5Z4j4wJPIuxyhvdefYqff3SKu7b+OGrgz+oy7UBTYnm0A +wm3+7srzpCiFiklbnhlWB1QFhxjt1NG2nArSEsw2YHhFGV+XPhrZbvk+bjJsiUruS1TknHRU EmZ9Mpx7OghBnQHUOxc3wEVWYCiHpxUbBn1UDwPwiyF1WVYKGdpcwYFrIhIFotIf5soTYk06X C79IEFmWDf5NEnA+GRlDsHOHzme7u8zYPt0SNei2FSn4vl7Ah/lL+l2EaRO1C/O6FyzqEmY8t gnYWwCvGZbp5NYPEShGbmIB5xd2MHUzqaVRPBMYJv5WOZNjL/vLWHNd4VX4zs9EHInlYFFIzI c8fGLMCPzO2+zlHGIcQP+XOcQzQ3mUItmFlWpLqMMTkwV5iTkvxqBxtNmwirE9zQ3ZjPs/zqg +BsqrEwpf0/5Nx1qnChULI1emZGqw== Subject: [arch-projects] [devtools] [PATCH] makechrootpkg: Prevent removing build dir when --noextract specified X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Arch Linux projects development discussion Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" X-UID: 555 Status: X-Keywords: Content-Length: 1539 From: Martchus --- makechrootpkg.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 8d8fd05..f8815d8 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -18,7 +18,7 @@ shopt -s nullglob init_variables() { default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg) makepkg_args=("${default_makepkg_args[@]}") - repack=false + keepbuilddir=false update_first=false clean_first=false run_namcap=false @@ -178,17 +178,17 @@ install_packages() { return $ret } -# Usage: prepare_chroot $copydir $HOME $repack $run_namcap +# Usage: prepare_chroot $copydir $HOME $keepbuilddir $run_namcap # Globals: # - MAKEFLAGS # - PACKAGER prepare_chroot() { local copydir=$1 local USER_HOME=$2 - local repack=$3 + local keepbuilddir=$3 local run_namcap=$4 - $repack || rm -rf "$copydir/build" + $keepbuilddir || rm -rf "$copydir/build" local builduser_uid builduser_gid builduser_uid="${SUDO_UID:-$UID}" @@ -359,8 +359,8 @@ main() { # See if -R was passed to makepkg for arg in "${@:OPTIND}"; do case ${arg%%=*} in - -*R*|--repackage) - repack=true + -*R*|--repackage|--noextract) + keepbuilddir=true break 2 ;; esac @@ -408,7 +408,7 @@ main() { download_sources "$copydir" "$makepkg_user" - prepare_chroot "$copydir" "$USER_HOME" "$repack" + prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" if arch-nspawn "$copydir" \ --bind="$PWD:/startdir" \