| 1 |
On Sat, 21 Feb 2015 11:12:50 -0800 |
| 2 |
Zac Medico <zmedico@g.o> wrote: |
| 3 |
|
| 4 |
> For manifest and manifest-check modes, there's no need to call the vcs |
| 5 |
> unless --if-modified=y is enabled. |
| 6 |
> |
| 7 |
> X-Gentoo-Bug: 540882 |
| 8 |
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=540882 |
| 9 |
> --- |
| 10 |
> bin/repoman | 5 ++++- |
| 11 |
> 1 file changed, 4 insertions(+), 1 deletion(-) |
| 12 |
> |
| 13 |
> diff --git a/bin/repoman b/bin/repoman |
| 14 |
> index 16ea055..13c220d 100755 |
| 15 |
> --- a/bin/repoman |
| 16 |
> +++ b/bin/repoman |
| 17 |
> @@ -1187,7 +1187,10 @@ mychanged = [] |
| 18 |
> mynew = [] |
| 19 |
> myremoved = [] |
| 20 |
> |
| 21 |
> -if vcs == "cvs": |
| 22 |
> +if (options.if_modified != "y" and |
| 23 |
> + options.mode in ("manifest", "manifest-check")): |
| 24 |
> + pass |
| 25 |
> +elif vcs == "cvs": |
| 26 |
> mycvstree = cvstree.getentries("./", recursive=1) |
| 27 |
> mychanged = cvstree.findchanged(mycvstree, recursive=1, |
| 28 |
> basedir="./") mynew = cvstree.findnew(mycvstree, recursive=1, |
| 29 |
> basedir="./") |
| 30 |
|
| 31 |
Looks good, merge please :) |
| 32 |
|
| 33 |
-- |
| 34 |
Brian Dolbec <dolsen> |
Archives