diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-11-11 14:00:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-11-11 14:00:13 +0000 |
| commit | 6ccaa1bbaa7a8201fe126068b3136d9fff2e3025 (patch) | |
| tree | 1e59c9aa4fc333e3a3fff6c1b3b6617ea33e789c /bin | |
| parent | c32e7fb77be44a2df22d6646758e2795a9587212 (diff) | |
| download | portage-6ccaa1bbaa7a8201fe126068b3136d9fff2e3025.tar.gz portage-6ccaa1bbaa7a8201fe126068b3136d9fff2e3025.tar.bz2 portage-6ccaa1bbaa7a8201fe126068b3136d9fff2e3025.zip | |
Fix initial cvs checkout logic for bug #100478.
svn path=/main/trunk/; revision=5006
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index ecc04e048..89e8633a1 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3405,14 +3405,16 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): if not os.path.exists(myportdir+"/CVS"): #initial checkout print ">>> Starting initial cvs checkout with "+syncuri+"..." + if os.path.exists(myportdir): + print "!!! existing '%s' directory; exiting." % myportdir + sys.exit(1) if os.path.exists(cvsdir+"/gentoo-x86"): print "!!! existing",cvsdir+"/gentoo-x86 directory; exiting." sys.exit(1) if portage.spawn("cd "+cvsdir+"; cvs -z0 -d "+cvsroot+" co -P gentoo-x86",settings,free=1): print "!!! cvs checkout error; exiting." sys.exit(1) - if cvsdir!=myportdir: - portage.movefile(cvsdir,settings["PORTDIR"]) + os.rename(os.path.join(cvsdir, "gentoo-x86"), myportdir) else: #cvs update print ">>> Starting cvs update with "+syncuri+"..." |