Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] repoman: handle removed packages in vcs_files_to_cps (bug 546010)
Date: Wed, 08 Apr 2015 22:33:41
Message-Id: 1428532404-4710-1-git-send-email-zmedico@gentoo.org
1 Make vcs_files_to_cps exclude packages that have been removed, since
2 calling code assumes that the packages exist.
3
4 X-Gentoo-Bug: 546010
5 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=546010
6 ---
7 bin/repoman | 5 ++++-
8 1 file changed, 4 insertions(+), 1 deletion(-)
9
10 diff --git a/bin/repoman b/bin/repoman
11 index 7101a00..7bcb89f 100755
12 --- a/bin/repoman
13 +++ b/bin/repoman
14 @@ -1047,7 +1047,10 @@ def vcs_files_to_cps(vcs_file_iter):
15 if len(f_split) > 3 and f_split[1] in categories:
16 modified_cps.append("/".join(f_split[1:3]))
17
18 - return frozenset(modified_cps)
19 + # Exclude packages that have been removed, since calling
20 + # code assumes that the packages exists.
21 + return frozenset(x for x in frozenset(modified_cps)
22 + if os.path.exists(os.path.join(repodir, x)))
23
24 def git_supports_gpg_sign():
25 status, cmd_output = \
26 --
27 2.3.1

Replies