diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2010-03-23 13:51:12 -0500 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2010-03-23 13:51:12 -0500 |
| commit | c0a792617296ef42c2e4a8876401e6829220d9de (patch) | |
| tree | 04eb753d980d117be7a37030b293e6492098fb0b | |
| parent | e40c8bca6d4b8917cae63d556af0696b424cb617 (diff) | |
| download | fedpkg-c0a792617296ef42c2e4a8876401e6829220d9de.tar.gz fedpkg-c0a792617296ef42c2e4a8876401e6829220d9de.tar.xz fedpkg-c0a792617296ef42c2e4a8876401e6829220d9de.zip | |
Fix fedora-cvs when checking out in a dir containing some existing checkout
https://bugzilla.redhat.com/show_bug.cgi?id=569954
fedora-cvs fails when trying to check out something in a dir containing an
existing (possibly entirely unrelated) checkout, because CVSROOT in environment
does not override files possibly found in ./CVS/. cvs -d $ROOT does.
| -rwxr-xr-x | src/fedora-cvs.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/fedora-cvs.py b/src/fedora-cvs.py index dd9d2fb..458e305 100755 --- a/src/fedora-cvs.py +++ b/src/fedora-cvs.py @@ -12,15 +12,17 @@ PKG_ROOT = 'cvs.fedoraproject.org:/cvs/pkgs' def main(user, pkg_list): if user is not None: - cvs_env = "CVSROOT=:ext:%s@%s CVS_RSH=ssh" % (user, PKG_ROOT) + cvs_env = "CVS_RSH=ssh" + cvs_root = ":ext:%s@%s" % (user, PKG_ROOT) else: - cvs_env = "CVSROOT=:pserver:anonymous@" + PKG_ROOT + cvs_env = "" + cvs_root = ":pserver:anonymous@" + PKG_ROOT for module in pkg_list: print "Checking out %s from fedora CVS as %s:" % \ (module, user or "anonymous") try: - retcode = call("%s /usr/bin/cvs co %s" % (cvs_env, module), shell=True) + retcode = call("%s /usr/bin/cvs -d %s co %s" % (cvs_env, cvs_root, module), shell=True) if retcode < 0: print >>sys.stderr, "CVS Checkout failed Error:", -retcode except OSError, e: |