From patchwork Tue Sep 21 15:24:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 45218 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB5E03858431 for ; Tue, 21 Sep 2021 15:24:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB5E03858431 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1632237886; bh=SRs7MaBNkVH3m/8Kh93YZuGq/Gij8E7/5yMfdekuizk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=KhPkGq+hte1a3pczKmsu5705TGNN7K1maqUeR/OGZqtVBDS57a09xugY3jNY4PER3 7kZPKsunyLeWKjgron9C4QDO+Ih2gHmUU5NpL3b2kI4FRacHlLNzcvRGnZg1FyfCam NTKMnYm1Jii0alMO5PKTA/P+78OCOF0Yb0O36ug4= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 589463858402 for ; Tue, 21 Sep 2021 15:24:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 589463858402 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-pRuusEW9NtCWb03P24zszg-1; Tue, 21 Sep 2021 11:24:39 -0400 X-MC-Unique: pRuusEW9NtCWb03P24zszg-1 Received: by mail-qt1-f197.google.com with SMTP id d20-20020ac81194000000b002a53ffbd04dso178006363qtj.12 for ; Tue, 21 Sep 2021 08:24:39 -0700 (PDT) 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:organization:date:message-id :user-agent:mime-version; bh=SRs7MaBNkVH3m/8Kh93YZuGq/Gij8E7/5yMfdekuizk=; b=f/MGHkzVdMmDwN8vugTa693PQtPzTwzxhfVpBokvo3usDewFVHk07qJD6NiiG6yoxf hdoeJBAfECl9+IaQ+jpwPTQnZGfRAN3tg/G5EaaoS1GElhFJ5q1ZRkeCB9Onb1cVxUFh rYqOSvciL7mFlBiV3TGfgOiTuTbjp/wawVhjgKHxzCE666V3w+69pEGPuIDu/F1sMyD7 5olTTtYPIme5wA+fClppahpwPxX1BR+kOtY+bVNdNFen7eg9LxatLL9w3FnbWYc16FeY /ahQXNAceDZVeCJ0t+Qw2seWnyjzFUO7k4eGfOdbm8RwY6t+0B+l3LAK1FeWkggW/W8F BwJQ== X-Gm-Message-State: AOAM5337BZlCtTaB1E2tDFCWlHu3XRUBFtnEJH1VyJPO5s6nSupSlyxe xVSku+lzP/GZBq2HyAhWgIKlI5nc1dsAWSsXi2aDkTEbjdklOIK+3WD2sDk0gVFsm8Ql5FDwDgG eGFUpHzYjXOMRpJ2IcVEVbTSAD5883khfz1T49s0EhJBVM+xnYv3nJQo4xPcCZP+eTWRz X-Received: by 2002:ae9:e895:: with SMTP id a143mr3895974qkg.113.1632237878942; Tue, 21 Sep 2021 08:24:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCsEX0hLuSiRmqqOnOFP/SXJ2FQvv5S/YE6am9b5nZ0dhDUSaOz18ZYko2UOEaiGTcFvgd9g== X-Received: by 2002:ae9:e895:: with SMTP id a143mr3895934qkg.113.1632237878459; Tue, 21 Sep 2021 08:24:38 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id x6sm10676344qkh.45.2021.09.21.08.24.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 08:24:38 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 5BCA75800FB; Tue, 21 Sep 2021 17:24:36 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] abipkgdiff: Do not erase working dirs before we are done using them Organization: Red Hat / France X-Operating-System: Fedora 36 X-URL: http://www.redhat.com Date: Tue, 21 Sep 2021 17:24:36 +0200 Message-ID: <8735pydk97.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, abipkgdiff removes working directories too early when there is no ABI change to report about any binary. In that case, we still need to access the working directories so that we can access ELF properties like SONAME and the like. This is useful to report about binaries removed/added. * tools/abipkgdiff.cc (compare_prepared_userspace_packages): Removing working directories "early" prevents e.g, dwarf_reader::get_soname_of_elf_file from accessing those files. So do not remove them until the very end. * tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-4.1.1-6.el8.x86_64-output-1.txt: Adjust. Signed-off-by: Dodji Seketeli Applied to master. --- ....1-6.el8.x86_64--libxcrypt-4.1.1-6.el8.x86_64-output-1.txt | 4 ++-- tools/abipkgdiff.cc | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-4.1.1-6.el8.x86_64-output-1.txt b/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-4.1.1-6.el8.x86_64-output-1.txt index b428bcf9..f8218df0 100644 --- a/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-4.1.1-6.el8.x86_64-output-1.txt +++ b/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-4.1.1-6.el8.x86_64-output-1.txt @@ -1,4 +1,4 @@ Removed binaries: - [D] /lib64/libcrypt.so.1.1.0, no SONAME + [D] /lib64/libcrypt.so.1.1.0, SONAME: libcrypt.so.1 Added binaries: - [A] /usr/lib64/libcrypt.so.2.0.0, no SONAME + [A] /usr/lib64/libcrypt.so.2.0.0, SONAME: libcrypt.so.2 diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc index 382cdfde..f90d5cb0 100644 --- a/tools/abipkgdiff.cc +++ b/tools/abipkgdiff.cc @@ -2702,9 +2702,6 @@ compare_prepared_userspace_packages(package& first_package, } } - if (compare_tasks.empty()) - maybe_erase_temp_dirs(first_package, second_package, opts); - comparison_done_notify notifier(diff); if (!compare_tasks.empty()) {