diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-08-27 17:54:13 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-08-27 17:54:13 +0000 |
commit | d59466926e57f1226fe654deb109812a1cd19389 (patch) | |
tree | 8544fbb2fe2c1cd8b32bfd073a13b84a5260a8d4 /bin/repoman | |
parent | 1c555bc3a42dbec89111710ebd42a617789fd602 (diff) | |
download | portage-d59466926e57f1226fe654deb109812a1cd19389.tar.gz portage-d59466926e57f1226fe654deb109812a1cd19389.tar.bz2 portage-d59466926e57f1226fe654deb109812a1cd19389.zip |
Bug #190406 - Filter the myheaders list so that it doesn't include binary blobs added to cvs with the -kb option.
svn path=/main/trunk/; revision=7705
Diffstat (limited to 'bin/repoman')
-rwxr-xr-x | bin/repoman | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman index ba2f163d1..fb6f23eb4 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1619,11 +1619,14 @@ else: print sys.exit(1) - if isCvs: + if True: mycvstree=portage.cvstree.getentries("./",recursive=1) mychanged=portage.cvstree.findchanged(mycvstree,recursive=1,basedir="./") mynew=portage.cvstree.findnew(mycvstree,recursive=1,basedir="./") myremoved=portage.cvstree.findremoved(mycvstree,recursive=1,basedir="./") + bin_blob_pattern = re.compile("^-kb$") + bin_blobs = set(portage.cvstree.findoption(mycvstree, + bin_blob_pattern, recursive=1, basedir="./")) if not (mychanged or mynew or myremoved): print green("RepoMan sez:"), "\"Doing nothing is not always good for QA.\"" print @@ -1641,6 +1644,8 @@ else: headerstring="'\$(Header|Id)" headerstring+=".*\$'" for myfile in myupdates: + if myfile in bin_blobs: + continue myout=getstatusoutput("egrep -q "+headerstring+" "+myfile) if myout[0]==0: myheaders.append(myfile) |