Return-Path: Delivered-To: apmail-gump-commits-archive@www.apache.org Received: (qmail 15866 invoked from network); 16 Apr 2005 18:35:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Apr 2005 18:35:11 -0000 Received: (qmail 23529 invoked by uid 500); 16 Apr 2005 18:35:11 -0000 Mailing-List: contact commits-help@gump.apache.org; run by ezmlm Precedence: bulk Reply-To: commits@gump.apache.org List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@gump.apache.org Received: (qmail 23514 invoked by uid 99); 16 Apr 2005 18:35:11 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 16 Apr 2005 11:35:11 -0700 Received: (qmail 15863 invoked by uid 65534); 16 Apr 2005 18:35:09 -0000 Message-ID: <20050416183509.15862.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 16 Apr 2005 18:35:09 -0000 Subject: svn commit: r161592 - gump/branches/Gump3/pygump/python/gump/plugins/updater.py To: commits@gump.apache.org From: leosimons@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: leosimons Date: Sat Apr 16 11:35:08 2005 New Revision: 161592 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161592 Log: Run update in right directory. * pygump/python/gump/plugins/updater.py: the updater was running in the wro= ng directory on updates. Fixed now. Modified: gump/branches/Gump3/pygump/python/gump/plugins/updater.py Modified: gump/branches/Gump3/pygump/python/gump/plugins/updater.py URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/pygump/python/gump/p= lugins/updater.py?view=3Ddiff&r1=3D161591&r2=3D161592 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- gump/branches/Gump3/pygump/python/gump/plugins/updater.py (original) +++ gump/branches/Gump3/pygump/python/gump/plugins/updater.py Sat Apr 16 11= :35:08 2005 @@ -62,23 +62,22 @@ =20 repopath =3D get_repository_directory(self.workdir, module.reposit= ory) current =3D os.path.curdir - os.chdir(repopath) - cvsdir =3D os.path.join(repopath, module.name, 'CVS') + modulepath =3D os.path.join(repopath, module.name) + cvsdir =3D os.path.join(modulepath, 'CVS') if not os.path.exists(cvsdir): - self.checkout(module) + self.checkout(module, repopath) else: - self.update(module) - os.chdir(current) + self.update(module, modulepath) =20 - def checkout(self, module): + def checkout(self, module, cwd): repository =3D module.repository.to_url() - cvs =3D Popen(['cvs', '-d', repository, 'checkout', module.name], = stdout=3DPIPE, stderr=3DSTDOUT) + cvs =3D Popen(['cvs', '-Q', '-d', repository, 'checkout', module.n= ame], cwd=3Dcwd, stdout=3DPIPE, stderr=3DSTDOUT) module.update_log =3D cvs.communicate()[0] module.update_exit_status =3D cvs.wait() module.update_type =3D UPDATE_TYPE_CHECKOUT =20 - def update(self, module): - cvs =3D Popen(['cvs', 'up', '-Pd'], stdout=3DPIPE, stderr=3DSTDOUT) + def update(self, module, cwd): + cvs =3D Popen(['cvs', '-Q', 'up', '-Pd'], cwd=3Dcwd, stdout=3DPIPE= , stderr=3DSTDOUT) module.update_log =3D cvs.communicate()[0] module.update_exit_status =3D cvs.wait() module.update_type =3D UPDATE_TYPE_UPDATE @@ -101,20 +100,23 @@ os.chdir(modulepath) svndir =3D os.path.join(modulepath, '.svn') if not os.path.exists(svndir): - self.checkout(module) + self.checkout(module, modulepath) else: - self.update(module) + self.update(module, moduelpath) os.chdir(current) =20 - def checkout(self, module): + def checkout(self, module, cwd): repository =3D module.repository.url + '/' + module.path - svn =3D Popen(['svn', 'checkout', repository, '.'], stdout=3DPIPE,= stderr=3DSTDOUT) + if not os.path.exists(cwd): + os.makedirs(cwd) + =20 + svn =3D Popen(['svn', 'checkout', repository, '.'], cwd=3Dcwd, std= out=3DPIPE, stderr=3DSTDOUT) module.update_log =3D svn.communicate()[0] module.update_exit_status =3D svn.wait() module.update_type =3D UPDATE_TYPE_CHECKOUT =20 - def update(self, module): - svn =3D Popen(['svn', 'up'], stdout=3DPIPE, stderr=3DSTDOUT) + def update(self, module, cwd): + svn =3D Popen(['svn', 'up'], cwd=3Dcwd, stdout=3DPIPE, stderr=3DST= DOUT) module.update_log =3D svn.communicate()[0] module.update_exit_status =3D svn.wait() module.update_type =3D UPDATE_TYPE_CHECKOUT