From 3fdb3a7a3fa3e057ba2bb898826647191dbeb075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 14 Jul 2010 23:17:07 +0200 Subject: Combine the two 'file.executable' checks into a single one. Instead of performing a single 'file.executable' check on auxiliary files and then another one on ebuild files, use a single check for them. This unifies the path output too. --- bin/repoman | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bin/repoman') diff --git a/bin/repoman b/bin/repoman index 8834b642b..0a1a92dd8 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1078,7 +1078,7 @@ for x in scanlist: ebuildlist=[] pkgs = {} for y in checkdirlist: - if y in no_exec and \ + if (y in no_exec or y.endswith(".ebuild")) and \ stat.S_IMODE(os.stat(os.path.join(checkdir, y)).st_mode) & 0o111: stats["file.executable"] += 1 fails["file.executable"].append(os.path.join(checkdir, y)) @@ -1394,9 +1394,6 @@ for x in scanlist: stats['changelog.ebuildadded'] += 1 fails['changelog.ebuildadded'].append(relative_path) - if stat.S_IMODE(os.stat(full_path).st_mode) & 0o111: - stats["file.executable"] += 1 - fails["file.executable"].append(x+"/"+y+".ebuild") if vcs in ("cvs", "svn", "bzr") and check_ebuild_notadded and y not in eadded: #ebuild not added to vcs stats["ebuild.notadded"]=stats["ebuild.notadded"]+1 -- cgit v1.2.3-1-g7c22