From: Fabian Groffen Date: Sun, 10 Jan 2010 16:54:00 +0000 (-0000) Subject: Merged from trunk -r15187:15188 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7d8389d4f2339a4416f314b05b298e07205cca96;p=portage.git Merged from trunk -r15187:15188 | 15188 | only return status for the current directory (or the | | grobian | directory being asked for), instead of the whole tree | svn path=/main/branches/prefix/; revision=15189 --- diff --git a/bin/repoman b/bin/repoman index 421d1df1e..1eb6ea7d4 100755 --- a/bin/repoman +++ b/bin/repoman @@ -928,7 +928,7 @@ elif vcs == "git": if elem[:repo_subdir_len] == repo_subdir] mynew = ["./" + elem[:-1] for elem in mynew] elif vcs == "bzr": - bzrstatus = os.popen("bzr status -S").readlines() + bzrstatus = os.popen("bzr status -S .").readlines() mychanged = [ "./" + elem.split()[-1:][0].split('/')[-1:][0] for elem in bzrstatus if elem and elem[1:2] == "M" ] mynew = [ "./" + elem.split()[-1:][0].split('/')[-1:][0] for elem in bzrstatus if elem and ( elem[1:2] == "NK" or elem[0:1] == "R" ) ] @@ -1970,7 +1970,7 @@ else: myf.close() if vcs == "bzr": try: - bzrstatus=os.popen("bzr status -S").readlines() + bzrstatus=os.popen("bzr status -S .").readlines() myunadded = [ "./"+elem.rstrip().split()[1].split('/')[-1:][0] for elem in bzrstatus if elem.startswith("?") or elem[0:2] == " D" ] except SystemExit as e: raise # TODO propogate this @@ -2076,7 +2076,7 @@ else: myremoved = ["./" + elem[:-1] for elem in myremoved] if vcs == "bzr": - bzrstatus = os.popen("bzr status -S").readlines() + bzrstatus = os.popen("bzr status -S .").readlines() mychanged = [ "./" + elem.split()[-1:][0].split('/')[-1:][0] for elem in bzrstatus if elem and elem[1:2] == "M" ] mynew = [ "./" + elem.split()[-1:][0].split('/')[-1:][0] for elem in bzrstatus if elem and ( elem[1:2] in "NK" or elem[0:1] == "R" ) ] myremoved = [ "./" + elem.split()[-1:][0].split('/')[-1:][0] for elem in bzrstatus if elem.startswith("-") ]