diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-portage/repoman | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'app-portage/repoman')
-rw-r--r-- | app-portage/repoman/Manifest | 1 | ||||
-rw-r--r-- | app-portage/repoman/files/repoman-2.3.0-bug-586864.patch | 32 |
2 files changed, 0 insertions, 33 deletions
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest index 7829c1384887..5ae047b71af8 100644 --- a/app-portage/repoman/Manifest +++ b/app-portage/repoman/Manifest @@ -1,4 +1,3 @@ -AUX repoman-2.3.0-bug-586864.patch 1034 BLAKE2B a2641d1c47907ec6069c490de30aabdcb654fefbff36665899463f2bd4fab343f254ab54038b5756c32b8df9058f270e9ef17c743898bdfec6b65847dae2f443 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e DIST repoman-2.3.10.tar.bz2 87545 BLAKE2B 67e1e514eebd50516aeaea2708ebe4c9d69cbf61add5fa19a31681f085a6dd8c39695cb63d9b4cd23caa955c85669148fce3c31c08b913e31839ff186e3b3ecc SHA512 498ce493661eb5939a5f1345337e11a84e97fc11a0556f2660bd8900f0cb0f6340a401e5728c4557248dd54bcdc0a7d2c72dbb23eea3acb35e053d7359c0e535 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367 DIST repoman-2.3.12.tar.bz2 86737 BLAKE2B b27d89b0fe62d52607c55b1cf1d5662699d1e46ad7ef85553d642be8fb915435f1748914b9d63febb7dddd67bd5623f72ba4aa9ca7634af98f85634af91a74c1 SHA512 64bede0e1deb7d2a8c4c702d6845e84f8937cbfb54f6f35d88a10b13c961f28948f17c9e1d623bf0f663b22f98dc4e8f514c200fb4f1b93d7535addd5efa1342 diff --git a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch deleted file mode 100644 index adba72fdcc57..000000000000 --- a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001 -From: Zac Medico <zmedico@gentoo.org> -Date: Thu, 23 Jun 2016 23:22:41 -0700 -Subject: repoman: skip QA checks in manifest mode (bug 586864) - -The relevent Scanner loop control logic broke in commit 4062c69dc27a -because it was relying on the return value from the Manifest module's -"check" method. - -Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py") -X-Gentoo-Bug: 586864 -X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864 ---- - pym/repoman/scanner.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py -index d7cd81f..8999751 100644 ---- a/pym/repoman/scanner.py -+++ b/pym/repoman/scanner.py -@@ -294,6 +294,8 @@ class Scanner(object): - - if self.generate_manifest: - manifest.Manifest(**self.kwargs).update_manifest(checkdir) -+ if self.options.mode == 'manifest': -+ continue - checkdirlist = os.listdir(checkdir) - - dynamic_data = { --- -cgit v0.12 - |