diff options
| author | Mark Wielaard <mark@klomp.org> | 2017-03-09 15:52:12 +0100 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-03-10 08:27:50 +0200 |
| commit | 22260d3580fcdafa5579128401adf1a05d36f316 (patch) | |
| tree | a68d7333eacf06df39f02648e73a74c9d05e60ad | |
| parent | 5bd77379eee167fbdb8d139dc9ab2da74f2a544f (diff) | |
| download | rpm-22260d3580fcdafa5579128401adf1a05d36f316.tar.gz | |
build/files.c: Unset __debug_package implies missing build-ids aren't fatal.
Historically we have only checked build_ids when __debug_package was
defined. So don't terminate the build if __debug_package is unset, even
when _missing_build_ids_terminate_build is. Only warn.
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | build/files.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/files.c b/build/files.c index 387284462..602164318 100644 --- a/build/files.c +++ b/build/files.c @@ -1699,7 +1699,11 @@ static int generateBuildIDs(FileList fl) if (build_id_links == BUILD_IDS_NONE || rc != 0) return rc; - int terminate = rpmExpandNumeric("%{?_missing_build_ids_terminate_build}"); + /* Historically we have only checked build_ids when __debug_package + was defined. So don't terminate the build if __debug_package is + unset, even when _missing_build_ids_terminate_build is. */ + int terminate = (rpmExpandNumeric("%{?_missing_build_ids_terminate_build}") + && rpmExpandNumeric("%{?__debug_package}")); /* Collect and check all build-ids for ELF files in this package. */ int needMain = 0; |