diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-10-30 22:25:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-30 22:25:27 +0000 |
| commit | 462f6a4ebd813d5e281da4dbfd7286c34edd2771 (patch) | |
| tree | f1c766aa311d1f05febac85416959844291b42f9 /bin | |
| parent | 62781abb763a380a32b1841311a0ceed4430569d (diff) | |
| download | portage-462f6a4ebd813d5e281da4dbfd7286c34edd2771.tar.gz portage-462f6a4ebd813d5e281da4dbfd7286c34edd2771.tar.bz2 portage-462f6a4ebd813d5e281da4dbfd7286c34edd2771.zip | |
recheck what changed in the repository also when nothing was added, because
manifest regeneration might change the Manifest, this fixes bug #229033
(branches/prefix r11755)
svn path=/main/trunk/; revision=11757
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/bin/repoman b/bin/repoman index 0ea4eece6..660294c68 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1696,10 +1696,9 @@ else: sys.exit(1) if vcs == "cvs": - if myautoadd: - mycvstree = cvstree.getentries("./", recursive=1) - mychanged = cvstree.findchanged(mycvstree, recursive=1, basedir="./") - mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./") + mycvstree = cvstree.getentries("./", recursive=1) + mychanged = cvstree.findchanged(mycvstree, recursive=1, basedir="./") + mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./") myremoved=portage.cvstree.findremoved(mycvstree,recursive=1,basedir="./") bin_blob_pattern = re.compile("^-kb$") no_expansion = set(portage.cvstree.findoption(mycvstree, bin_blob_pattern, @@ -1707,10 +1706,9 @@ else: if vcs == "svn": - if myautoadd: - svnstatus = os.popen("svn status").readlines() - mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ] - mynew = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ] + svnstatus = os.popen("svn status").readlines() + mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ] + mynew = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ] myremoved = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("D") ] # in contrast to CVS, SVN expands nothing by default. # bin_blobs historically |