diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-09-06 17:41:01 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-09-06 17:41:01 +0000 |
commit | 0a4c6057b7ed234c24c9b8082ceadc2e60f7bd92 (patch) | |
tree | 36979dc1f18d6e60f76093f6fcfc10b332d41086 /bin | |
parent | ab2bff3134b94f4c7b8971012d7e7f58a87a675e (diff) | |
download | portage-0a4c6057b7ed234c24c9b8082ceadc2e60f7bd92.tar.gz portage-0a4c6057b7ed234c24c9b8082ceadc2e60f7bd92.tar.bz2 portage-0a4c6057b7ed234c24c9b8082ceadc2e60f7bd92.zip |
Bug #190406 - Filter the myheaders list so that it doesn't include binary
blobs added to cvs with the -kb option. (trunk r7705)
svn path=/main/branches/2.1.2/; revision=7736
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/repoman | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman index 20899baf9..df0d5e440 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1617,11 +1617,14 @@ else: print sys.exit(1) - if isCvs: + if True: mycvstree=cvstree.getentries("./",recursive=1) mychanged=cvstree.findchanged(mycvstree,recursive=1,basedir="./") mynew=cvstree.findnew(mycvstree,recursive=1,basedir="./") myremoved=cvstree.findremoved(mycvstree,recursive=1,basedir="./") + bin_blob_pattern = re.compile("^-kb$") + bin_blobs = set(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 @@ -1639,6 +1642,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) |