launcher: simplify .repo search ceiling check
In the .repo discovery loop
while curdir != '/' and curdir != olddir:
... break if we found .repo ...
olddir = curdir
curdir = os.path.dirname(curdir)
the "while" condition is meant to avoid searching forever if we do not
find .repo before reaching the top-level directory of the filesystem.
For that purpose, the first half of the condition is redundant; once
we reach "/", the parent directory will be "/" again and the curdir !=
olddir check would suffice to terminate the search. Simplify by
removing the redundant first half of the check.
Noticed by code inspection. The first half of the check was retained
when introducing the second half in df14a70c ("Make path references OS
independent", 2011-01-09), in an excess of caution.
This also improves consistency a little: if I start with curdir =
'/home/me', then with the redundant check in place we search
before hitting / and giving up. On Windows, if I start with
'c:/users/me', then we search
before hitting a repetition and giving up. Fortunately it is not
common for people to set up repo clients at the top level of
filesystems, but consistently following the latter behavior should
make debugging a little easier in case it comes up.
Reviewed-by: Mike Frysinger <firstname.lastname@example.org>
Tested-by: Jonathan Nieder <email@example.com>
diff --git a/repo b/repo
index cf1f78b..b13e34c 100755
@@ -966,9 +966,7 @@
repo = None
olddir = None
- while curdir != '/' \
- and curdir != olddir \
- and not repo:
+ while curdir != olddir and not repo:
repo = os.path.join(curdir, repodir, REPO_MAIN)
if not os.path.isfile(repo):
repo = None