From 6ccaa1bbaa7a8201fe126068b3136d9fff2e3025 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 11 Nov 2006 14:00:13 +0000 Subject: Fix initial cvs checkout logic for bug #100478. svn path=/main/trunk/; revision=5006 --- bin/emerge | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bin/emerge') 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+"..." -- cgit v1.2.3-1-g7c22