From 462f6a4ebd813d5e281da4dbfd7286c34edd2771 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 30 Oct 2008 22:25:27 +0000 Subject: [PATCH] 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 --- bin/repoman | 14 ++++++-------- 1 file 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 -- 2.26.2