[gentoo-portage-dev] [PATCH] repoman: handle removed packages in vcs_files_to_cps (bug 546010)

[gentoo-portage-dev] [PATCH] repoman: handle removed packages in vcs_files_to_cps (bug 546010)

[Zac Medico]

Make vcs_files_to_cps exclude packages that have been removed, since
calling code assumes that the packages exist.

X-Gentoo-Bug: 546010
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=546010
---
 bin/repoman | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/repoman b/bin/repoman
index 7101a00..7bcb89f 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1047,7 +1047,10 @@ def vcs_files_to_cps(vcs_file_iter):
 			if len(f_split) > 3 and f_split[1] in categories:
 				modified_cps.append("/".join(f_split[1:3]))
 
-	return frozenset(modified_cps)
+	# Exclude packages that have been removed, since calling
+	# code assumes that the packages exists.
+	return frozenset(x for x in frozenset(modified_cps)
+		if os.path.exists(os.path.join(repodir, x)))
 
 def git_supports_gpg_sign():
 	status, cmd_output = \
-- 
2.3.1

Re: [gentoo-portage-dev] [PATCH] repoman: handle removed packages in vcs_files_to_cps (bug 546010)

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

LGTM. But you don't need to duplicate the comment in the commit
message, since the commit is so short & clean.

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iF4EAREIAAYFAlUpE10ACgkQRtClrXBQc7X4fAEAjgUKZqg56mwdhm7g2QIsAj8X
cHHQHwSy448jDN8uvbQA/RiSGtLH/obRcKWPYwXgcbq4s/H7gFxgASgHJqHnwCxK
=3VlM
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] repoman: handle removed packages in vcs_files_to_cps (bug 546010)

[Zac Medico]

On 04/11/2015 05:28 AM, Alexander Berntsen wrote:
> LGTM. But you don't need to duplicate the comment in the commit
> message, since the commit is so short & clean.

Okay, I'll drop the duplicate comment before I push.
-- 
Thanks,
Zac