From ewt@specifixinc.com Thu Aug 5 11:39:50 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FdobI013603 for ; Thu, 5 Aug 2004 11:39:50 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3B42C16759 for ; Thu, 5 Aug 2004 08:40:17 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FeFTD006117; Thu, 5 Aug 2004 11:40:15 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75FeFPH006113; Thu, 5 Aug 2004 11:40:15 -0400 Date: Thu, 5 Aug 2004 11:40:15 -0400 From: ewt@specifixinc.com Message-Id: <200408051540.i75FeFPH006113@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.141,1.142 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 15:39:51 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv6085/repository Modified Files: changeset.py Log Message: 1. changed files need to show up in rollbacks whether or not they were config files 2. when files are removed between versions, the rollback needs a place holder for that file if the contents have changed (leaving it to the local rollback to get the contents right) Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- changeset.py 4 Aug 2004 16:54:12 -0000 1.141 +++ changeset.py 5 Aug 2004 15:40:13 -0000 1.142 @@ -346,8 +346,14 @@ if fsFile == origFile: cont = filecontents.FromFilesystem(fullPath) - rollback.addFileContents(fileId, - ChangedFileTypes.file, cont, 0) + else: + # a file which was removed in this changeset is + # missing from the files; we need to to put an + # empty file in here so we can apply the rollback + cont = filecontents.FromString("") + + rollback.addFileContents(fileId, ChangedFileTypes.file, + cont, 0) for (fileId, newPath, newVersion) in pkgCs.getChangedFileList(): if not pkg.hasFile(fileId): From ewt@specifixinc.com Thu Aug 5 11:39:51 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FdobI013604 for ; Thu, 5 Aug 2004 11:39:51 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 87FD416762 for ; Thu, 5 Aug 2004 08:40:17 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FeFTD006116; Thu, 5 Aug 2004 11:40:15 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75FeFFB006109; Thu, 5 Aug 2004 11:40:15 -0400 Date: Thu, 5 Aug 2004 11:40:15 -0400 From: ewt@specifixinc.com Message-Id: <200408051540.i75FeFFB006109@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local update.py,1.116,1.117 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 15:39:51 -0000 Update of /cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv6085/local Modified Files: update.py Log Message: 1. changed files need to show up in rollbacks whether or not they were config files 2. when files are removed between versions, the rollback needs a place holder for that file if the contents have changed (leaving it to the local rollback to get the contents right) Index: update.py =================================================================== RCS file: /cvs/conary/local/update.py,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- update.py 4 Aug 2004 21:07:45 -0000 1.116 +++ update.py 5 Aug 2004 15:40:13 -0000 1.117 @@ -757,7 +757,7 @@ (filecs, hash) = changeset.fileChangeSet(fileId, srcFile, f) changeSet.addFile(fileId, srcFileVersion, newVersion, filecs) - if hash and (srcFile.flags.isConfig() or isSrcPkg): + if hash: newCont = filecontents.FromFilesystem(realPath) if srcFile.hasContents: From ewt@specifixinc.com Thu Aug 5 11:41:12 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FfCbI013617 for ; Thu, 5 Aug 2004 11:41:12 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 2619316759 for ; Thu, 5 Aug 2004 08:41:39 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FfbTD006238; Thu, 5 Aug 2004 11:41:37 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75Ffb7v006235; Thu, 5 Aug 2004 11:41:37 -0400 Date: Thu, 5 Aug 2004 11:41:37 -0400 From: ewt@specifixinc.com Message-Id: <200408051541.i75Ffb7v006235@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary checkin.py,1.120,1.121 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 15:41:12 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv6217 Modified Files: checkin.py Log Message: fix for checkout of non-regular files Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- checkin.py 4 Aug 2004 20:29:25 -0000 1.120 +++ checkin.py 5 Aug 2004 15:41:35 -0000 1.121 @@ -185,7 +185,7 @@ fileObj = files.ThawFile(cs.getFileChange(fileId), fileId) if not fileObj.hasContents: - fileObj.restore(*tup) + fileObj.restore(None, '/', fullPath, 1) else: if fileObj.flags.isConfig(): earlyRestore.append((fileId, ('/', fullPath, 1))) From ewt@specifixinc.com Thu Aug 5 11:50:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FoFbI013627 for ; Thu, 5 Aug 2004 11:50:15 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 762AB16759 for ; Thu, 5 Aug 2004 08:50:42 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FoeTD006478; Thu, 5 Aug 2004 11:50:40 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75Foe3m006475; Thu, 5 Aug 2004 11:50:40 -0400 Date: Thu, 5 Aug 2004 11:50:40 -0400 From: ewt@specifixinc.com Message-Id: <200408051550.i75Foe3m006475@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary checkin.py,1.121,1.122 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 15:50:16 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv6457 Modified Files: checkin.py Log Message: checkout was using wrong fileObj objects for restores (though the contents were right) Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- checkin.py 5 Aug 2004 15:41:35 -0000 1.121 +++ checkin.py 5 Aug 2004 15:50:38 -0000 1.122 @@ -187,16 +187,17 @@ if not fileObj.hasContents: fileObj.restore(None, '/', fullPath, 1) else: + assert(fileObj.id() == fileId) if fileObj.flags.isConfig(): - earlyRestore.append((fileId, ('/', fullPath, 1))) + earlyRestore.append((fileId, fileObj, ('/', fullPath, 1))) else: - lateRestore.append((fileId, ('/', fullPath, 1))) + lateRestore.append((fileId, fileObj, ('/', fullPath, 1))) earlyRestore.sort() lateRestore.sort() - for fileId, tup in earlyRestore + lateRestore: - contents = cs.getFileContents(fileId)[1] + for fileId, fileObj, tup in earlyRestore + lateRestore: + contents = cs.getFileContents(fileObj.id())[1] fileObj.restore(*((contents,) + tup)) state.write(workDir + "/CONARY") From msw@specifixinc.com Thu Aug 5 11:54:07 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75Fs7bI013633 for ; Thu, 5 Aug 2004 11:54:07 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 086CA16759 for ; Thu, 5 Aug 2004 08:54:34 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75FsWTD006657; Thu, 5 Aug 2004 11:54:32 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75FsWrN006654; Thu, 5 Aug 2004 11:54:32 -0400 Date: Thu, 5 Aug 2004 11:54:32 -0400 From: Matt Wilson Message-Id: <200408051554.i75FsWrN006654@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary Makefile,1.68,1.69 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 15:54:07 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv6636 Modified Files: Makefile Log Message: 0.6.2 Index: Makefile =================================================================== RCS file: /mnt/specifix/cvs/conary/Makefile,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- Makefile 4 Aug 2004 18:01:38 -0000 1.68 +++ Makefile 5 Aug 2004 15:54:30 -0000 1.69 @@ -14,7 +14,7 @@ all: subdirs conary-wrapper -export VERSION = 0.6.1 +export VERSION = 0.6.2 export TOPDIR = $(shell pwd) export DISTDIR = $(TOPDIR)/conary-$(VERSION) export prefix = /usr From ewt@specifixinc.com Thu Aug 5 13:27:09 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75HR8bI014010 for ; Thu, 5 Aug 2004 13:27:08 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 1E5581675B for ; Thu, 5 Aug 2004 10:27:35 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75HRWTD009574; Thu, 5 Aug 2004 13:27:32 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75HRWjj009571; Thu, 5 Aug 2004 13:27:32 -0400 Date: Thu, 5 Aug 2004 13:27:32 -0400 From: ewt@specifixinc.com Message-Id: <200408051727.i75HRWjj009571@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary checkin.py,1.122,1.123 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 17:27:09 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv9559 Modified Files: checkin.py Log Message: added a comment Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- checkin.py 5 Aug 2004 15:50:38 -0000 1.122 +++ checkin.py 5 Aug 2004 17:27:30 -0000 1.123 @@ -187,6 +187,8 @@ if not fileObj.hasContents: fileObj.restore(None, '/', fullPath, 1) else: + # to tracking the fileId separately from the fileObj lest + # us sort the list of files by fileid assert(fileObj.id() == fileId) if fileObj.flags.isConfig(): earlyRestore.append((fileId, fileObj, ('/', fullPath, 1))) From msw@specifixinc.com Thu Aug 5 13:44:35 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75HiZbI014067 for ; Thu, 5 Aug 2004 13:44:35 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id EB23A1675B for ; Thu, 5 Aug 2004 10:45:01 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75Hj0TD009997; Thu, 5 Aug 2004 13:45:00 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75Hj0H2009994; Thu, 5 Aug 2004 13:45:00 -0400 Date: Thu, 5 Aug 2004 13:45:00 -0400 From: Matt Wilson Message-Id: <200408051745.i75Hj0H2009994@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary checkin.py,1.123,1.124 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 17:44:35 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv9982 Modified Files: checkin.py Log Message: comment edit Index: checkin.py =================================================================== RCS file: /mnt/specifix/cvs/conary/checkin.py,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- checkin.py 5 Aug 2004 17:27:30 -0000 1.123 +++ checkin.py 5 Aug 2004 17:44:58 -0000 1.124 @@ -187,7 +187,7 @@ if not fileObj.hasContents: fileObj.restore(None, '/', fullPath, 1) else: - # to tracking the fileId separately from the fileObj lest + # tracking the fileId separately from the fileObj lets # us sort the list of files by fileid assert(fileObj.id() == fileId) if fileObj.flags.isConfig(): From dbc@specifixinc.com Thu Aug 5 16:15:12 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75KFBbI014253 for ; Thu, 5 Aug 2004 16:15:12 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 895F8162A1 for ; Thu, 5 Aug 2004 13:15:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75KFbTD013696; Thu, 5 Aug 2004 16:15:37 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75KFaxa013685; Thu, 5 Aug 2004 16:15:36 -0400 Date: Thu, 5 Aug 2004 16:15:36 -0400 From: David Christian Message-Id: <200408052015.i75KFaxa013685@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary conary.1, 1.11, 1.12 conary.py, 1.65, 1.66 conarycfg.py, 1.59, 1.60 cook.py, 1.213, 1.214 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 20:15:12 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv13661 Modified Files: conary.1 conary.py conarycfg.py cook.py Log Message: Add --use-flag option and parse Use.flag from config file. Set up grounds for Flags. config Index: conary.1 =================================================================== RCS file: /cvs/conary/conary.1,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- conary.1 30 Jul 2004 16:34:15 -0000 1.11 +++ conary.1 5 Aug 2004 20:15:34 -0000 1.12 @@ -129,7 +129,10 @@ .B cook \fI[\fR--prep\fI] [\fR--macros file\fI] [\fR--target-branch \fI]\fR \e .PD 0 .TP -.B \ \ \ \ \ [\fR--resume [|policy]] \fI\fP.recipe\fI|...\fP +.B \ \ \ \ \ [\fR--resume [|policy]] [\fR--use-flag " True|False"] \fP \e +.PD 0 +.TP +.B \ \ \ \ \ \fI\fP.recipe\fI|...\fP .PD Build a package. If \fB--prep\fP is specified, the souce code is unpacked, but is not built. if \fB--macros\fP is specified, it @@ -143,6 +146,12 @@ only be used with local recipe files, not source components grabbed from a repository. .IP +The --use-flag option can be used to override the default Use flags +and package-specific flags for this instantiaton. The format for + may be Use., where is a system-wide Use +flag, or Flags.., where is a flag defined +in . , , are case sensitive. +.IP If the thing to be cooked ends in \fB.recipe\fP, then it must be a recipe file and the package will be cooked from the filesystem. Otherwise, it must name a repository component and Index: conary.py =================================================================== RCS file: /cvs/conary/conary.py,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- conary.py 4 Aug 2004 16:32:37 -0000 1.65 +++ conary.py 5 Aug 2004 20:15:34 -0000 1.66 @@ -56,7 +56,8 @@ def usage(rc = 1): print "usage: conary branch []" print " conary changeset [] " - print " conary cook [--prep] [--debug-exceptions] [--macros file] +" + print ' conary cook [--prep] [--debug-exceptions] [--macros file] ' + print ' [--use-flag " "]+ +' print " conary emerge +" print " conary commit " print " conary erase []" @@ -82,10 +83,12 @@ print "" print "cook flags: --macros" print " --noclean" + print ' --use-flag " "' print " --prep" print " --resume [policy|]" print " --debug-exceptions" print " --target-branch " + print ' --use-flag " "' print "" print "query flags: --full-versions" print " --ids" @@ -131,6 +134,7 @@ argDef["config"] = MULT_PARAM argDef["debug"] = NO_PARAM argDef["debug-exceptions"] = NO_PARAM + argDef["use-flag"] = MULT_PARAM argDef["full-versions"] = NO_PARAM argDef["ids"] = NO_PARAM argDef["info"] = NO_PARAM @@ -218,6 +222,11 @@ prep = 0 resume = None buildBranch = None + if argSet.has_key('use-flag'): + for flag in argSet['use-flag']: + cfg.configLine(flag) + del argSet['use-flag'] + if argSet.has_key('prep'): del argSet['prep'] prep = 1 Index: conarycfg.py =================================================================== RCS file: /cvs/conary/conarycfg.py,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- conarycfg.py 30 Jul 2004 16:34:15 -0000 1.59 +++ conarycfg.py 5 Aug 2004 20:15:34 -0000 1.60 @@ -20,6 +20,7 @@ import deps.arch import deps.deps import os +from build import use import versions STRING, BOOL, LABEL, STRINGDICT, STRINGLIST, CALLBACK = range(6) @@ -39,19 +40,28 @@ elif exception: raise IOError, file + def __getitem__(self, name): + return self.__dict__[name] + def configLine(self, line, file = "override"): line = line.strip() if not line or line[0] == '#': return (key, val) = line.split(None, 1) - key = key.lower() - if not self.lowerCaseMap.has_key(key): - raise ParseError, ("%s:%s: configuration value '%s' unknown" % (file, self.lineno, key)) + (key, type) = self.checkKey(key) + self.setValue(key, val, type, file) + + def checkKey(self, key): + lckey = key.lower() + if not self.lowerCaseMap.has_key(lckey): + raise ParseError, ("%s:%s: configuration value '%s' unknown" % (file, self.lineno, key)) else: - key = self.lowerCaseMap[key] + return (self.lowerCaseMap[lckey], None) - type = self.types[key] + def setValue(self, key, val, type=None, file="override"): + if type == None: + type = self.types[key] if type == STRING: self.__dict__[key] = val elif type == STRINGDICT: @@ -67,12 +77,14 @@ except versions.ParseError, e: raise versions.ParseError, str(e) elif type == BOOL: + if isinstance(val, bool): + self.__dict__[key] = val if val.lower() in ('0', 'false'): self.__dict__[key] = False elif val.lower() in ('1', 'true'): self.__dict__[key] = True else: - raise ParseError, ("%s:%s: expected True or False for configuration value '%s'" % (self.file, self.lineno, key)) + raise ParseError, ("%s:%s: expected True or False for configuration value '%s'" % (file, self.lineno, key)) def display(self): keys = self.defaults.keys() @@ -131,6 +143,10 @@ 'sourceSearchDir' : '.', 'tmpDir' : '/var/tmp/', } + + + pkgflags = {} + useflags = {} def __init__(self): ConfigFile.__init__(self) @@ -144,6 +160,37 @@ self.read(os.environ["HOME"] + "/" + ".conaryrc") self.read("conaryrc") + def checkKey(self, key): + if key.find('.') != -1: + directive,arg = key.split('.', 1) + directive = directive.lower() + if directive in ('use', 'flags'): + return self.checkFlagKey(directive, arg) + return ConfigFile.checkKey(self, key) + + def checkFlagKey(self, directive, key): + if directive == 'use': + if key not in use.Use: + raise ParseError, ("%s:%s: Unknown Use flag %s" % (file, self.lineno, key)) + else: + self.useflags[key] = True + return ('Use.' + key, BOOL) + elif directive == 'flags': + if key.find('.') == -1: + raise ParseError, ("%s:%s: Flag %s must be of form package.flag" % (file, self.lineno, key)) + else: + package, flag = key.split('.', 1) + if package not in self.pkgflags: + self.pkgflags[package] = {} + self.pkgflags[package][flag] = True + return ('Flags.' + key, BOOL) + + def useKeys(self): + return self.useflags.keys() + + def pkgKeys(self, pkg): + return self.pkgdefaults.get(pkg, {}).keys() + class ConaryCfgError(Exception): """ Index: cook.py =================================================================== RCS file: /cvs/conary/cook.py,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- cook.py 3 Aug 2004 21:50:24 -0000 1.213 +++ cook.py 5 Aug 2004 20:15:34 -0000 1.214 @@ -539,6 +539,7 @@ buildList = [] changeSetFile = None targetLabel = None + use.applyCfg(cfg) if item.endswith('.recipe') and os.path.isfile(item): if emerge: From dbc@specifixinc.com Thu Aug 5 16:15:13 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75KFCbI014254 for ; Thu, 5 Aug 2004 16:15:12 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 545FC16760 for ; Thu, 5 Aug 2004 13:15:39 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75KFbTD013695; Thu, 5 Aug 2004 16:15:37 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75KFa0A013692; Thu, 5 Aug 2004 16:15:36 -0400 Date: Thu, 5 Aug 2004 16:15:36 -0400 From: David Christian Message-Id: <200408052015.i75KFa0A013692@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build use.py,1.59,1.60 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 20:15:13 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv13661/build Modified Files: use.py Log Message: Add --use-flag option and parse Use.flag from config file. Set up grounds for Flags. config Index: use.py =================================================================== RCS file: /cvs/conary/build/use.py,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- use.py 3 Aug 2004 21:50:24 -0000 1.59 +++ use.py 5 Aug 2004 20:15:34 -0000 1.60 @@ -98,7 +98,7 @@ self[key]._set(bool(value)) else: dict.__setitem__(self, key, value) - + def __getattr__(self, name): if name in self.__dict__: return self.__dict__[name] @@ -362,3 +362,9 @@ Use.trackUsed(arg) if localflags is not None: localflags.trackUsed(arg) + +def applyCfg(config, localflags=None): + Use._thaw() + for key in config.useKeys(): + Use[key] = config['Use.' + key] + Use._freeze() From msw@specifixinc.com Thu Aug 5 17:08:30 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75L8TbI014357 for ; Thu, 5 Aug 2004 17:08:30 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 8B2F3162A1 for ; Thu, 5 Aug 2004 14:08:56 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75L8sTD014957; Thu, 5 Aug 2004 17:08:54 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75L8sgQ014954; Thu, 5 Aug 2004 17:08:54 -0400 Date: Thu, 5 Aug 2004 17:08:54 -0400 From: Matt Wilson Message-Id: <200408052108.i75L8sgQ014954@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository repository.py,1.159,1.160 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:08:30 -0000 Update of /mnt/specifix/cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv14942 Modified Files: repository.py Log Message: don't use contents from the database Index: repository.py =================================================================== RCS file: /mnt/specifix/cvs/conary/repository/repository.py,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- repository.py 4 Aug 2004 16:54:12 -0000 1.159 +++ repository.py 5 Aug 2004 21:08:52 -0000 1.160 @@ -650,17 +650,18 @@ # we already have the contents of this file... we can go # ahead and restore it reusing those contents - if repos._hasFileContents(fileObj.contents.sha1()): + # XXX this breaks filecontainer test +# if repos._hasFileContents(fileObj.contents.sha1()): # if we already have the file in the data store we can # get the contents from there - fileContents = filecontents.FromDataStore( - repos.contentsStore, - fileObj.contents.sha1(), - fileObj.contents.size()) - contType = changeset.ChangedFileTypes.file - self.addFileContents(fileObj.contents.sha1(), version, - fileContents, restoreContents, - fileObj.flags.isConfig()) +## fileContents = filecontents.FromDataStore( +## repos.contentsStore, +## fileObj.contents.sha1(), +## fileObj.contents.size()) +## contType = changeset.ChangedFileTypes.file +## self.addFileContents(fileObj.contents.sha1(), version, +## fileContents, restoreContents, +## fileObj.flags.isConfig()) elif fileObj.flags.isConfig(): tup = (fileId, fileObj, oldPath, oldfile, pkgName, From johnsonm@specifixinc.com Thu Aug 5 17:10:20 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LAJbI014365 for ; Thu, 5 Aug 2004 17:10:20 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 951B9162A1 for ; Thu, 5 Aug 2004 14:10:46 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LAiTD015096; Thu, 5 Aug 2004 17:10:44 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75LAiMn015094; Thu, 5 Aug 2004 17:10:44 -0400 Date: Thu, 5 Aug 2004 17:10:44 -0400 From: johnsonm@specifixinc.com Message-Id: <200408052110.i75LAiMn015094@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build recipe.py,1.230,1.231 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:10:20 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15081 Modified Files: recipe.py Log Message: allow extra source commands as well as build commands Index: recipe.py =================================================================== RCS file: /spx/cvs/conary/build/recipe.py,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- recipe.py 4 Aug 2004 16:39:52 -0000 1.230 +++ recipe.py 5 Aug 2004 21:10:42 -0000 1.231 @@ -97,6 +97,7 @@ def setupRecipeDict(d, filename): exec 'from build import build' in d + exec 'from build import action' in d exec 'from build.recipe import PackageRecipe' in d exec 'from build.recipe import GroupRecipe' in d exec 'from build.recipe import FilesetRecipe' in d @@ -336,6 +337,10 @@ files.append(f) return files + def extraSource(self, action): + self._sources.append(action) + + def unpackSources(self, builddir): self.macros.builddir = builddir for source in self._sources: From msw@specifixinc.com Thu Aug 5 17:20:28 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LKRbI014376 for ; Thu, 5 Aug 2004 17:20:28 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id E1961162A1 for ; Thu, 5 Aug 2004 14:20:54 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LKrTD015706; Thu, 5 Aug 2004 17:20:53 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75LKrRa015703; Thu, 5 Aug 2004 17:20:53 -0400 Date: Thu, 5 Aug 2004 17:20:53 -0400 From: Matt Wilson Message-Id: <200408052120.i75LKrRa015703@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository repository.py,1.160,1.161 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:20:28 -0000 Update of /mnt/specifix/cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15691/repository Modified Files: repository.py Log Message: clarify comment Index: repository.py =================================================================== RCS file: /mnt/specifix/cvs/conary/repository/repository.py,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- repository.py 5 Aug 2004 21:08:52 -0000 1.160 +++ repository.py 5 Aug 2004 21:20:51 -0000 1.161 @@ -650,7 +650,7 @@ # we already have the contents of this file... we can go # ahead and restore it reusing those contents - # XXX this breaks filecontainer test + # XXX commenting this out breaks filesets # if repos._hasFileContents(fileObj.contents.sha1()): # if we already have the file in the data store we can # get the contents from there From msw@specifixinc.com Thu Aug 5 17:20:38 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LKbbI014382 for ; Thu, 5 Aug 2004 17:20:37 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id C68A0162A1 for ; Thu, 5 Aug 2004 14:21:04 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LL3TD015810; Thu, 5 Aug 2004 17:21:03 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75LL3P8015807; Thu, 5 Aug 2004 17:21:03 -0400 Date: Thu, 5 Aug 2004 17:21:03 -0400 From: Matt Wilson Message-Id: <200408052121.i75LL3P8015807@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary Makefile,1.69,1.70 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:20:38 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15775 Modified Files: Makefile Log Message: 0.6.3 Index: Makefile =================================================================== RCS file: /mnt/specifix/cvs/conary/Makefile,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- Makefile 5 Aug 2004 15:54:30 -0000 1.69 +++ Makefile 5 Aug 2004 21:21:00 -0000 1.70 @@ -14,7 +14,7 @@ all: subdirs conary-wrapper -export VERSION = 0.6.2 +export VERSION = 0.6.3 export TOPDIR = $(shell pwd) export DISTDIR = $(TOPDIR)/conary-$(VERSION) export prefix = /usr From msw@specifixinc.com Thu Aug 5 17:24:48 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LOlbI014481 for ; Thu, 5 Aug 2004 17:24:48 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id E7750162A1 for ; Thu, 5 Aug 2004 14:25:14 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LPCTD015994; Thu, 5 Aug 2004 17:25:12 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75LPCNA015991; Thu, 5 Aug 2004 17:25:12 -0400 Date: Thu, 5 Aug 2004 17:25:12 -0400 From: Matt Wilson Message-Id: <200408052125.i75LPCNA015991@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local update.py,1.117,1.118 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:24:48 -0000 Update of /mnt/specifix/cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15979/local Modified Files: update.py Log Message: append to the list, not to the dictionary Index: update.py =================================================================== RCS file: /mnt/specifix/cvs/conary/local/update.py,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- update.py 5 Aug 2004 15:40:13 -0000 1.117 +++ update.py 5 Aug 2004 21:25:10 -0000 1.118 @@ -86,7 +86,7 @@ if not self.userRemovals.has_key((troveName, troveVersion, troveFlavor)): self.userRemovals[(troveName, troveVersion, troveFlavor)] = [ fileId ] else: - self.userRemovals.append(fileId) + self.userRemovals[(troveName, troveVersion, troveFlavor)].append(fileId) def iterUserRemovals(self): for ((troveName, troveVersion, troveFlavor), fileIdList) in \ From ewt@specifixinc.com Thu Aug 5 17:52:56 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LqtbI014515 for ; Thu, 5 Aug 2004 17:52:56 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id D6B9A162A1 for ; Thu, 5 Aug 2004 14:53:22 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LrLTD017012; Thu, 5 Aug 2004 17:53:21 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75LrLdI017002; Thu, 5 Aug 2004 17:53:21 -0400 Date: Thu, 5 Aug 2004 17:53:21 -0400 From: ewt@specifixinc.com Message-Id: <200408052153.i75LrLdI017002@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local database.py,1.132,1.133 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:52:56 -0000 Update of /cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16960/local Modified Files: database.py Log Message: trove changesets can now be generated between flavors; this entailed a lot of work matching up troves in Trove.diff() to allow recusive changesets. also changed the protocol version to 3 Index: database.py =================================================================== RCS file: /cvs/conary/local/database.py,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- database.py 3 Aug 2004 15:28:52 -0000 1.132 +++ database.py 5 Aug 2004 21:53:19 -0000 1.133 @@ -224,19 +224,32 @@ for (name, version, flavor) in absSet.getPrimaryPackageList(): cs.addPrimaryPackage(name, version, flavor) + items = [] + for newPkg in job.newPackageList(): + items.append((newPkg.getName(), newPkg.getVersion(), + newPkg.getFlavor())) + + outdated = helper.outdatedTroves(self, items) + for newPkg in job.newPackageList(): pkgName = newPkg.getName() + newVersion = newPkg.getVersion() + newFlavor = newPkg.getFlavor() + + key = (pkgName, newVersion, newFlavor) + if not outdated.has_key(key): + log.warning("package %s %s is already installed -- skipping", + pkgName, newVersion.asString()) + continue - oldVersion = helper.previousVersion(self, pkgName, - newPkg.getVersion(), - newPkg.getFlavor()) + (oldVersion, oldFlavor) = outdated[key][1:3] if not oldVersion: # new package; the Package.diff() right after this never # sets the absolute flag, so the right thing happens old = None else: - old = self.getTrove(pkgName, oldVersion, newPkg.getFlavor(), + old = self.getTrove(pkgName, oldVersion, oldFlavor, pristine = True) # we ignore pkgsNeeded; it doesn't mean much in this case From ewt@specifixinc.com Thu Aug 5 17:52:56 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LqubI014516 for ; Thu, 5 Aug 2004 17:52:56 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id F32F916762 for ; Thu, 5 Aug 2004 14:53:22 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LrLTD017013; Thu, 5 Aug 2004 17:53:21 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75LrLsb017007; Thu, 5 Aug 2004 17:53:21 -0400 Date: Thu, 5 Aug 2004 17:53:21 -0400 From: ewt@specifixinc.com Message-Id: <200408052153.i75LrLsb017007@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.142,1.143 netclient.py,1.42,1.43 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:52:56 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16960/repository Modified Files: changeset.py netclient.py Log Message: trove changesets can now be generated between flavors; this entailed a lot of work matching up troves in Trove.diff() to allow recusive changesets. also changed the protocol version to 3 Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- changeset.py 5 Aug 2004 15:40:13 -0000 1.142 +++ changeset.py 5 Aug 2004 21:53:19 -0000 1.143 @@ -302,8 +302,9 @@ # this is a modified package and needs to be inverted invertedPkg = trove.TroveChangeSet(pkgCs.getName(), - pkgCs.getFlavor(), pkg.getChangeLog(), - pkgCs.getNewVersion(), pkgCs.getOldVersion()) + pkg.getChangeLog(), + pkgCs.getNewVersion(), pkgCs.getOldVersion(), + pkgCs.getNewFlavor(), pkgCs.getOldFlavor()) for (name, list) in pkgCs.iterChangedTroves(): for (oper, version, flavor) in list: Index: netclient.py =================================================================== RCS file: /cvs/conary/repository/netclient.py,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- netclient.py 5 Aug 2004 13:23:59 -0000 1.42 +++ netclient.py 5 Aug 2004 21:53:19 -0000 1.43 @@ -85,8 +85,7 @@ self.cache[serverName] = server try: - # we can talk to version 1 and version 2 repositories - if server.checkVersion(2) < 1: + if server.checkVersion(3) != 3: raise repository.OpenError('Server version too old') except OSError, e: raise repository.OpenError('Error occured opening repository ' @@ -243,7 +242,7 @@ def getTroves(self, troves): chgSetList = [] for (name, version, flavor) in troves: - chgSetList.append((name, flavor, None, version, True)) + chgSetList.append((name, (None, None), (version, flavor), True)) cs = self._getChangeSet(chgSetList, recurse = False, withFiles = False) @@ -269,17 +268,19 @@ def _getChangeSet(self, chgSetList, recurse = True, withFiles = True): l = [] serverName = None - for (name, flavor, old, new, absolute) in chgSetList: + for (name, (old, oldFlavor), (new, newFlavor), absolute) in chgSetList: if old: - l.append((name, self.fromFlavor(flavor), - self.fromVersion(old), self.fromVersion(new), + l.append((name, + (self.fromVersion(old), self.fromFlavor(oldFlavor)), + (self.fromVersion(new), self.fromFlavor(newFlavor)), absolute)) if serverName is None: serverName = old.branch().label().getHost() assert(serverName == old.branch().label().getHost()) else: - l.append((name, self.fromFlavor(flavor), - 0, self.fromVersion(new), + l.append((name, + (0, 0), + (self.fromVersion(new), self.fromFlavor(newFlavor)), absolute)) if serverName is None: From ewt@specifixinc.com Thu Aug 5 17:52:58 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LqvbI014521 for ; Thu, 5 Aug 2004 17:52:57 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id B8ED816763 for ; Thu, 5 Aug 2004 14:53:23 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LrLTD017011; Thu, 5 Aug 2004 17:53:21 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75LrLxY016996; Thu, 5 Aug 2004 17:53:21 -0400 Date: Thu, 5 Aug 2004 17:53:21 -0400 From: ewt@specifixinc.com Message-Id: <200408052153.i75LrLxY016996@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary checkin.py, 1.124, 1.125 helper.py, 1.46, 1.47 trove.py, 1.131, 1.132 updatecmd.py, 1.96, 1.97 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:52:58 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16960 Modified Files: checkin.py helper.py trove.py updatecmd.py Log Message: trove changesets can now be generated between flavors; this entailed a lot of work matching up troves in Trove.diff() to allow recusive changesets. also changed the protocol version to 3 Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- checkin.py 5 Aug 2004 17:44:58 -0000 1.124 +++ checkin.py 5 Aug 2004 21:53:19 -0000 1.125 @@ -170,7 +170,8 @@ # it's a shame that findTrove already sent us the trove since we're # just going to request it again - cs = repos.createChangeSet([(trv.getName(), None, None, trv.getVersion(), + cs = repos.createChangeSet([(trv.getName(), (None, None), + (trv.getVersion(), None), True)]) pkgCs = cs.iterNewPackageList().next() @@ -319,7 +320,8 @@ old = old[0] oldV = old.getVersion() - cs = repos.createChangeSet([(troveName, None, oldV, newV, False)]) + cs = repos.createChangeSet([(troveName, (oldV, None), + (newV, None), False)]) _showChangeSet(repos, cs, old, new) @@ -443,8 +445,8 @@ headVersion = head.getVersion() newBranch = helper.fullBranchName(None, headVersion, versionStr) - changeSet = repos.createChangeSet([(pkgName, None, baseVersion, - headVersion, 0)]) + changeSet = repos.createChangeSet([(pkgName, (baseVersion, None), + (headVersion, None), 0)]) packageChanges = changeSet.iterNewPackageList() pkgCs = packageChanges.next() Index: helper.py =================================================================== RCS file: /cvs/conary/helper.py,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- helper.py 13 Jul 2004 14:33:26 -0000 1.46 +++ helper.py 5 Aug 2004 21:53:19 -0000 1.47 @@ -18,6 +18,7 @@ import repository import repository.netclient +import trove import versions def openRepository(repMap): @@ -178,43 +179,53 @@ return newVersion -def previousVersion(repos, troveName, troveVersion, troveFlavor): +def outdatedTroves(db, l): """ - Returns the trove version which will be outdated by installing - the specified trove. If none will be outdated, None is returned. - If we can't tell which version will be outdated, AmbiguousOperation - is raised. + For a (troveName, troveVersion, troveFlavor) list return a dict indexed by + elements in that list. Each item in the dict is the (troveName, + troveVersion, troveFlavor) item for an already installed trove if + installing that item doesn't cause a removal, otherwise it is which needs + to be removed as part of the update. a (None, None) tuple means the + item is new and nothing should be removed while no entry means that the + item is already installed. + """ + + names = {} + for (name, version, flavor) in l: + names[name] = True + + instList = [] + for name in names.iterkeys(): + # get the current troves installed + try: + instList += db.findTrove(name) + except repository.repository.PackageNotFound, e: + pass + + # now we need to figure out how to match up the version and flavors + # pair. a shortcut is to stick the old troves in one group and + # the new troves in another group; when we diff those groups + # diff tells us how to match them up. anything which doesn't get + # a match gets removed. got that? + instGroup = trove.Trove("@update", versions.NewVersion(), + None, None) + for instTrove in instList: + instGroup.addTrove(instTrove.getName(), instTrove.getVersion(), + instTrove.getFlavor()) + + newGroup = trove.Trove("@update", versions.NewVersion(), + None, None) + for (name, version, flavor) in l: + newGroup.addTrove(name, version, flavor) + + trvChgs = newGroup.diff(instGroup)[2] + + resultDict = {} + for (name, oldVersion, newVersion, oldFlavor, newFlavor) in trvChgs: + resultDict[(name, newVersion, newFlavor)] = (name, oldVersion, + oldFlavor) - @type repos: repository.Repository - @type troveName: str - @type troveVersion: versions.Version - @type troveFlavor: deps.deps.DependencySet - @rtype: versions.Version or None - """ - - oldVersion = None - oldVersions = repos.getTroveVersionList(troveName) - if len(oldVersions) > 1: - # try and pick the one which looks like a good match - # for the new version - newBranch = troveVersion.branch() - for ver in oldVersions: - if ver.branch() == newBranch: - # make sure it's the right flavor - flavors = repos.pkgVersionFlavors(troveName, ver) - if troveFlavor in flavors: - oldVersion = ver - break - - if not oldVersion: - raise AmbiguousOperation - elif oldVersions: - # make sure it's the right flavor - flavors = repos.pkgVersionFlavors(troveName, oldVersions[0]) - if troveFlavor in flavors: - oldVersion = oldVersions[0] - - return oldVersion + return resultDict class PackageNotFound(Exception): Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- trove.py 31 Jul 2004 03:13:29 -0000 1.131 +++ trove.py 5 Aug 2004 21:53:19 -0000 1.132 @@ -248,11 +248,12 @@ this instance. We return the change set, a list of other package diffs which should be included for this change set to be complete, and a list of file change sets which need to be included. The list of package - changes is of the form (pkgName, oldVersion, newVersion). If absolute - is True, oldVersion is always None and absolute diffs can be used. - Otherwise, absolute versions are not necessary, and oldVersion of None - means the package is new. The list of file changes is a list of - (fileId, oldVersion, newVersion, oldPath, newPath) tuples, where newPath is + changes is of the form (pkgName, oldVersion, newVersion, oldFlavor, + newFlavor). If absolute is True, oldVersion is always None and + absolute diffs can be used. Otherwise, absolute versions are not + necessary, and oldVersion of None means the package is new. The list of + file changes is a list of (fileId, oldVersion, newVersion, oldPath, + newPath) tuples, where newPath is the path to the file in this package. @param them: object to generate a change set from (may be None) @@ -270,15 +271,16 @@ # stayed the same if them: themMap = them.idMap - chgSet = TroveChangeSet(self.name, self.flavor, self.changeLog, + chgSet = TroveChangeSet(self.name, self.changeLog, them.getVersion(), self.getVersion(), + them.getFlavor(), self.getFlavor(), absolute = False) else: themMap = {} - chgSet = TroveChangeSet(self.name, self.flavor, self.changeLog, - None, - self.getVersion(), + chgSet = TroveChangeSet(self.name, self.changeLog, + None, self.getVersion(), + None, self.getFlavor(), absolute = absolute) # dependency and flavor information is always included in total; @@ -338,10 +340,14 @@ (name, version, flavor) = key chgSet.newTroveVersion(name, version, flavor) - if added.has_key((name, flavor)): - added[(name, flavor)].append(version) + + if not added.has_key(name): + added[name] = {} + + if added[name].has_key(flavor): + added[name][flavor].append(version) else: - added[(name, flavor)] = [ version ] + added[name][flavor] = [ version ] if them: for key in them.packages.iterkeys(): @@ -349,60 +355,160 @@ (name, version, flavor) = key chgSet.oldTroveVersion(name, version, flavor) - if removed.has_key((name, flavor)): - removed[(name, flavor)].append(version) + if not removed.has_key(name): + removed[name] = {} + + if removed[name].has_key(flavor): + removed[name][flavor].append(version) else: - removed[(name, flavor)] = [ version ] + removed[name][flavor] = [ version ] pkgList = [] if absolute: - for name, flavor in added.keys(): - for version in added[(name, flavor)]: - pkgList.append((name, None, version, flavor)) + for name in added.keys(): + for flavor in added[name]: + for version in added[name][flavor]: + pkgList.append((name, None, version, None, flavor)) return (chgSet, filesNeeded, pkgList) # use added and removed to assemble a list of package diffs which need # to go along with this change set - for name, flavor in added.keys(): - if not removed.has_key((name, flavor)): - for version in added[(name, flavor)]: - pkgList.append((name, None, version, flavor)) + + for name in added.keys(): + if not removed.has_key(name): + # there isn't anything which disappeared that has the same + # name; this must be a new addition + for newFlavor in added[name]: + for version in added[name][newFlavor]: + pkgList.append((name, None, version, None, newFlavor)) + + del added[name] + + changePair = [] + # we know everything added now has a matching name in removed; let's + # try and match up the flavors. first of all we'll look for exact + # matches + for name in added.keys(): + for newFlavor in added[name].keys(): + if removed[name].has_key(newFlavor): + # we have a name/flavor match + changePair.append((name, added[name][newFlavor], newFlavor, + removed[name][newFlavor], newFlavor)) + del added[name][newFlavor] + del removed[name][newFlavor] + + if not added[name]: + del added[name] + if not removed[name]: + del removed[name] + + # for things that are left, see if we can match flavors based on + # the architecture + for name in added.keys(): + for newFlavor in added[name].keys(): + if not newFlavor: + # this isn't going to match anything well + continue + + match = None + + # first check for matches which are a superset of the old + # flavor, then for ones which are a subset of the old flavor + for oldFlavor in removed[name].keys(): + if not oldFlavor: + continue + + if newFlavor.satisfies(oldFlavor): + match = removed[name][oldFlavor] + del removed[name][oldFlavor] + break + + if match: + changePair.append((name, added[name][newFlavor], newFlavor, + removed[name][oldFlavor], oldFlavor)) + del added[name][newFlavor] + continue + + for oldFlavor in removed[name].keys(): + if not oldFlavor: + continue + + if oldFlavor.satisfies(newFlavor): + match = removed[name][oldFlavor] + del removed[name][oldFlavor] + break + + if match: + changePair.append((name, added[name][newFlavor], newFlavor, + removed[name][oldFlavor], oldFlavor)) + del added[name][newFlavor] + + if not added[name]: + del added[name] + if not removed[name]: + del removed[name] + + for name in added.keys(): + if len(added[name]) == 1 and len(removed[name]) == 1: + # one of each? they *must* be a good match... + newFlavor = added[name].keys()[0] + oldFlavor = removed[name].keys()[0] + changePair.append((name, added[name][newFlavor], newFlavor, + removed[name][oldFlavor], oldFlavor)) + del added[name] + del removed[name] continue - # name was changed between this version. for each new version - # of a package, try and generate the diff between that package - # and the version of the package which was removed which was - # on the same branch. if that's not possible, see if the parent - # of the package was removed, and use that as the diff. if - # we can't do that and only one version of this package is - # being obsoleted, use that for the diff. if we can't do that - # either, throw up our hands in a fit of pique + for name in added.keys(): + for newFlavor in added[name].keys(): + # no good match. that's too bad + changePair.append((name, added[name][newFlavor], newFlavor, + None, None)) + + for (name, newVersionList, newFlavor, oldVersionList, oldFlavor) \ + in changePair: + assert(newVersionList) + + if not oldVersionList: + for newVersion in newVersionList: + pkgList.append((name, None, newVersion, + None, newFlavor)) + + # for each new version of a package, try and generate the diff + # between that package and the version of the package which was + # removed which was on the same branch. if that's not possible, + # see if the parent of the package was removed, and use that as + # the diff. if we can't do that and only one version of this + # package is being obsoleted, use that for the diff. if we + # can't do that either, throw up our hands in a fit of pique - for version in added[(name, flavor)]: + for version in newVersionList: branch = version.branch() if version.hasParent(): parent = version.parent() else: parent = None - if len(removed[(name, flavor)]) == 1: - pkgList.append((name, removed[(name, flavor)][0], version, - flavor)) + if len(oldVersionList) == 1: + pkgList.append((name, oldVersionList[0], version, + oldFlavor, newFlavor)) else: sameBranch = None parentNode = None - for other in removed[(name, flavor)]: + for other in oldVersionList: if other.branch() == branch: sameBranch = other if parent and other == parent: parentNode = other if sameBranch: - pkgList.append((name, sameBranch, version, flavor)) + pkgList.append((name, sameBranch, version, + oldFlavor, newFlavor)) elif parentNode: - pkgList.append((name, parentNode, version, flavor)) + pkgList.append((name, parentNode, version, + oldFlavor, newFlavor)) else: # Here's the fit of pique. This shouldn't happen # except for the most ill-formed of groups. @@ -564,8 +670,10 @@ depformat('Requires', self.requires, f) if self.provides: depformat('Provides', self.provides, f) - if self.flavor: - depformat('Flavor', self.flavor, f) + if self.oldFlavor: + depformat('Old Flavor', self.flavor, f) + if self.newFlavor: + depformat('New Flavor', self.flavor, f) for (fileId, path, version) in self.newFiles: #f.write("\tadded (%s(.*)%s)\n" % (fileId[:6], fileId[-6:])) @@ -634,8 +742,15 @@ rc.append("REQUIRES %s\n" % (self.requires.freeze())) if self.provides: rc.append("PROVIDES %s\n" % (self.provides.freeze())) - if self.flavor: - rc.append("FLAVOR %s\n" % (self.flavor.freeze())) + + if self.oldFlavor and self.newFlavor: + rc.append("FLAVOR %s %s\n" % (self.oldFlavor.freeze(), + self.newFlavor.freeze())) + elif self.oldFlavor and not self.newFlavor: + rc.append("FLAVOR %s -\n" % (self.oldFlavor.freeze())) + elif not self.oldFlavor and self.newFlavor: + rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) + if self.changeLog: frz = self.changeLog.freeze() rc.append("CL %d\n" % frz.count("\n")) @@ -689,11 +804,20 @@ def getRequires(self): return self.requires + def getOldFlavor(self): + return self.newFlavor + + def getNewFlavor(self): + return self.newFlavor + def getFlavor(self): - return self.flavor + return self.newFlavor - def __init__(self, name, flavor, changeLog, oldVersion, newVersion, - absolute = 0): + def __init__(self, name, changeLog, oldVersion, newVersion, + oldFlavor, newFlavor, absolute = 0): + assert(isinstance(newVersion, versions.AbstractVersion)) + assert(not newFlavor or isinstance(newFlavor, deps.DependencySet)) + assert(not oldFlavor or isinstance(oldFlavor, deps.DependencySet)) self.name = name self.oldVersion = oldVersion self.newVersion = newVersion @@ -705,7 +829,8 @@ self.packages = {} self.provides = None self.requires = None - self.flavor = flavor + self.oldFlavor = oldFlavor + self.newFlavor = newFlavor class ThawTroveChangeSet(TroveChangeSet): @@ -783,11 +908,18 @@ newVersion = versions.ThawVersion(l[rest]) # find the flavor - flavor = None + oldFlavor = None + newFlavor = None for i, l in enumerate(lines[1:4]): if l.startswith("FLAVOR "): - dep = l.split(' ', 1)[1] - flavor = deps.ThawDependencySet(dep) + oldFlavorStr, newFlavorStr = l.split(' ', 2)[1:3] + + if oldFlavorStr != "-": + oldFlavor = deps.ThawDependencySet(oldFlavorStr) + + if newFlavorStr != "-": + newFlavor = deps.ThawDependencySet(newFlavorStr) + del lines[i + 1] break @@ -801,8 +933,9 @@ del lines[i: first + cnt] break - TroveChangeSet.__init__(self, pkgName, flavor, changeLog, oldVersion, - newVersion, absolute = (pkgType == "ABS")) + TroveChangeSet.__init__(self, pkgName, changeLog, oldVersion, + newVersion, oldFlavor, newFlavor, + absolute = (pkgType == "ABS")) for line in lines: self.parse(line) Index: updatecmd.py =================================================================== RCS file: /cvs/conary/updatecmd.py,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- updatecmd.py 30 Jul 2004 20:59:53 -0000 1.96 +++ updatecmd.py 5 Aug 2004 21:53:19 -0000 1.97 @@ -18,7 +18,9 @@ import os from repository import repository import sys +import trove import util +import versions def doUpdate(repos, cfg, pkg, versionStr = None, replaceFiles = False, tagScript = None, keepExisting = False): @@ -57,24 +59,27 @@ # so far no changeset (either the path didn't exist or we could not # read it try: - pkgList = repos.findTrove(cfg.installLabel, pkg, cfg.flavor, + newList = repos.findTrove(cfg.installLabel, pkg, cfg.flavor, versionStr) except repository.PackageNotFound, e: log.error(str(e)) return + newItems = [] + for newTrove in newList: + newItems.append((newTrove.getName(), newTrove.getVersion(), + newTrove.getFlavor())) + + # everything which needs to be installed is in this list; if it's + # not here, it's a duplicate + outdated = helper.outdatedTroves(db, newItems) list = [] - for pkg in pkgList: - if db.hasTrove(pkg.getName(), pkg.getVersion(), pkg.getFlavor()): - continue - - currentVersion = helper.previousVersion(db, pkg.getName(), - pkg.getVersion(), - pkg.getFlavor()) - - list.append((pkg.getName(), pkg.getFlavor(), currentVersion, - pkg.getVersion(), 0)) - + for newItem in newItems: + (name, newVersion, newFlavor) = newItem + if outdated.has_key(newItem): + (oldVersion, oldFlavor) = outdated[newItem][1:3] + list.append((name, (oldVersion, oldFlavor), + (newVersion, newFlavor), 0)) if not list: log.warning("no new troves were found") From ewt@specifixinc.com Thu Aug 5 17:53:48 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75LrmbI014533 for ; Thu, 5 Aug 2004 17:53:48 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 12152162A1 for ; Thu, 5 Aug 2004 14:54:15 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75Ls9TD017143; Thu, 5 Aug 2004 17:54:09 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75Ls9ou017136; Thu, 5 Aug 2004 17:54:09 -0400 Date: Thu, 5 Aug 2004 17:54:09 -0400 From: ewt@specifixinc.com Message-Id: <200408052154.i75Ls9ou017136@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary filecontainer.py,1.30,1.31 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 21:53:48 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv17060 Modified Files: filecontainer.py Log Message: chagned filecontainer version to 3 due to allowing diffs between trove flavors Index: filecontainer.py =================================================================== RCS file: /cvs/conary/filecontainer.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- filecontainer.py 4 Aug 2004 16:54:12 -0000 1.30 +++ filecontainer.py 5 Aug 2004 21:54:07 -0000 1.31 @@ -64,7 +64,7 @@ import util FILE_CONTAINER_MAGIC = "\xEA\x3F\x81\xBB" -FILE_CONTAINER_VERSION = 2 +FILE_CONTAINER_VERSION = 3 SEEK_SET = 0 SEEK_CUR = 1 SEEK_END = 2 From dbc@specifixinc.com Thu Aug 5 18:09:11 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75M9BbI014578 for ; Thu, 5 Aug 2004 18:09:11 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3545B162A1 for ; Thu, 5 Aug 2004 15:09:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75M9ZTD017995; Thu, 5 Aug 2004 18:09:35 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75M9Ysu017986; Thu, 5 Aug 2004 18:09:34 -0400 Date: Thu, 5 Aug 2004 18:09:34 -0400 From: David Christian Message-Id: <200408052209.i75M9Ysu017986@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary cook.py,1.214,1.215 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:09:11 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv17957 Modified Files: cook.py Log Message: When you get an error while cooking a recipe, you should get both the line number in the recipe as well as getting a post mortem at the actual error spot Index: cook.py =================================================================== RCS file: /cvs/conary/cook.py,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- cook.py 5 Aug 2004 20:15:34 -0000 1.214 +++ cook.py 5 Aug 2004 22:09:32 -0000 1.215 @@ -404,50 +404,43 @@ builddir = cfg.buildPath + "/" + recipeObj.name use.track(True, recipeObj.Flags) + recipeObj.setup() + bldInfo = buildinfo.BuildInfo(builddir) + recipeObj.buildinfo = bldInfo + + # don't bother with prep the dirs if we are resuming + if not resume: + if os.path.exists(builddir): + shutil.rmtree(builddir) + util.mkdirChain(builddir) + bldInfo.begin() + recipeObj.unpackSources(builddir) + # if we're only extracting, continue to the next recipe class. + if prep: + return + + cwd = os.getcwd() try: - recipeObj.setup() - bldInfo = buildinfo.BuildInfo(builddir) - recipeObj.buildinfo = bldInfo - - # don't bother with prep the dirs if we are resuming - if not resume: - if os.path.exists(builddir): - shutil.rmtree(builddir) - util.mkdirChain(builddir) + if resume: + bldInfo.read() + destdir = bldInfo.destdir bldInfo.begin() - recipeObj.unpackSources(builddir) - # if we're only extracting, continue to the next recipe class. - if prep: - return - - cwd = os.getcwd() - try: - if resume: - bldInfo.read() - destdir = bldInfo.destdir - bldInfo.begin() - bldInfo.destdir = destdir - if resume is True: - resume = bldInfo.lastline - else: - util.mkdirChain(builddir + '/' + recipeObj.mainDir()) - util.mkdirChain(cfg.tmpDir) - destdir = tempfile.mkdtemp("", "conary-%s-" % recipeObj.name, cfg.tmpDir) - bldInfo.destdir = destdir - os.chdir(builddir + '/' + recipeObj.mainDir()) - recipeObj.doBuild(builddir, destdir, resume=resume) - log.info('Processing %s', recipeClass.name) - recipeObj.doDestdirProcess() # includes policy - bldInfo.stop() - use.track(False, recipeObj.Flags) - finally: - os.chdir(cwd) - except Exception, e: - if cfg.debugRecipeExceptions: - raise - else: - print e - sys.exit(1) + bldInfo.destdir = destdir + if resume is True: + resume = bldInfo.lastline + else: + util.mkdirChain(builddir + '/' + recipeObj.mainDir()) + util.mkdirChain(cfg.tmpDir) + destdir = tempfile.mkdtemp("", "conary-%s-" % recipeObj.name, cfg.tmpDir) + bldInfo.destdir = destdir + os.chdir(builddir + '/' + recipeObj.mainDir()) + recipeObj.doBuild(builddir, destdir, resume=resume) + log.info('Processing %s', recipeClass.name) + recipeObj.doDestdirProcess() # includes policy + bldInfo.stop() + use.track(False, recipeObj.Flags) + finally: + os.chdir(cwd) grpName = recipeClass.name From dbc@specifixinc.com Thu Aug 5 18:09:13 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75M9CbI014581 for ; Thu, 5 Aug 2004 18:09:12 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 91C4C162A1 for ; Thu, 5 Aug 2004 15:09:39 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75M9ZTD017994; Thu, 5 Aug 2004 18:09:35 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75M9Yj1017990; Thu, 5 Aug 2004 18:09:34 -0400 Date: Thu, 5 Aug 2004 18:09:34 -0400 From: David Christian Message-Id: <200408052209.i75M9Yj1017990@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build action.py,1.9,1.10 build.py,1.175,1.176 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:09:13 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv17957/build Modified Files: action.py build.py Log Message: When you get an error while cooking a recipe, you should get both the line number in the recipe as well as getting a post mortem at the actual error spot Index: action.py =================================================================== RCS file: /cvs/conary/build/action.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- action.py 19 Jul 2004 17:25:59 -0000 1.9 +++ action.py 5 Aug 2004 22:09:32 -0000 1.10 @@ -12,9 +12,11 @@ # full details. # +import pdb import util import sys import string +import traceback # build.py and policy.py need some common definitions @@ -96,6 +98,33 @@ # copy the keywords into our dict, overwriting the defaults self.__dict__.update(keywords) +def excepthook(type, exc_msg, tb): + sys.excepthook = sys.__excepthook__ + global actionobject + self = actionobject + if actionobject.recipe.cfg.debugRecipeExceptions: + lines = traceback.format_exception(type, exc_msg, tb) + print string.joinfields(lines, "") + if self.linenum is not None: + prefix = "%s:%s:" % (self.file, self.linenum) + prefix_len = len(prefix) + if str(exc_msg)[:prefix_len] != prefix: + exc_message = "%s:%s: %s: %s" % (self.file, self.linenum, + type.__name__, exc_msg) + print exc_message + buildinfo = self.recipe.buildinfo + buildinfo.error = exc_message + buildinfo.file = self.file + buildinfo.lastline = self.linenum + buildinfo.stop() + + if actionobject.recipe.cfg.debugRecipeExceptions and sys.stdout.isatty() \ + and sys.stdin.isatty(): + pdb.post_mortem(tb) + else: + sys.exit(1) + + class RecipeAction(Action): """ Action class which accepts the use= keyword to control execution, @@ -118,11 +147,15 @@ # virtual method for actually executing the action def doAction(self): + global actionobject if self.use: - try: + if self.linenum is None: + self.do() + else: + sys.excepthook = excepthook + actionobject = self self.do() - except Exception: - self.handle_exception() + sys.excepthook = sys.__excepthook__ def do(self): @@ -169,25 +202,7 @@ raise type, "%s:%s: %s: %s" % (self.file, self.linenum, type.__name__, msg) - - def handle_exception(self): - if self.linenum is None: - raise exc_type, exc_message - # Avoid duplicating file/name prefix - exc_type = sys.exc_info()[0] - exc_msg = sys.exc_info()[1] - prefix = "%s:%s:" % (self.file, self.linenum) - prefix_len = len(prefix) - if str(exc_msg)[:prefix_len] != prefix: - exc_message = "%s:%s: %s: %s" % (self.file, self.linenum, - exc_type.__name__, exc_msg) - buildinfo = self.recipe.buildinfo - buildinfo.error = exc_message - buildinfo.file = self.file - buildinfo.lastline = self.linenum - buildinfo.stop() - raise exc_type, exc_message - + # XXX look at ShellCommand versus Action class ShellCommand(RecipeAction): """Base class for shell-based commands. ShellCommand is an abstract class Index: build.py =================================================================== RCS file: /cvs/conary/build/build.py,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- build.py 4 Aug 2004 02:49:02 -0000 1.175 +++ build.py 5 Aug 2004 22:09:32 -0000 1.176 @@ -29,6 +29,7 @@ import log import re import stat +import sys import action from use import Use @@ -62,10 +63,13 @@ def doAction(self): if self.use: - try: + if self.linenum is None: self.do(self.recipe.macros) - except Exception: - self.handle_exception() + else: + sys.excepthook = action.excepthook + action.actionobject = self + self.do(self.recipe.macros) + sys.excepthook = sys.__excepthook__ def do(self, macros): """ From ewt@specifixinc.com Thu Aug 5 18:13:10 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MD9bI014592 for ; Thu, 5 Aug 2004 18:13:09 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id AF7F9162A1 for ; Thu, 5 Aug 2004 15:13:36 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MDVTD018269; Thu, 5 Aug 2004 18:13:31 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75MDVXQ018266; Thu, 5 Aug 2004 18:13:31 -0400 Date: Thu, 5 Aug 2004 18:13:31 -0400 From: ewt@specifixinc.com Message-Id: <200408052213.i75MDVXQ018266@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary cscmd.py,1.13,1.14 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:13:10 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18253 Modified Files: cscmd.py Log Message: use the right old flavor when creating a changeset Index: cscmd.py =================================================================== RCS file: /cvs/conary/cscmd.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cscmd.py 27 Jul 2004 20:03:29 -0000 1.13 +++ cscmd.py 5 Aug 2004 22:13:29 -0000 1.14 @@ -26,6 +26,7 @@ troveName, newVersionStr) newVersion = pkgList[0].getVersion() + newFlavor = pkgList[0].getFlavor() if (oldVersionStr): pkgList = repos.findTrove(cfg.installLabel, troveName, pkgList[0].getFlavor(), @@ -35,11 +36,13 @@ troveName, oldVersionStr) oldVersion = pkgList[0].getVersion() - + oldFlavor = pkgList[0].getFlavor() else: oldVersion = None + oldFlavor = None - list = [(troveName, pkgList[0].getFlavor(), oldVersion, newVersion, (not oldVersion))] + list = [(troveName, (oldVersion, oldFlavor), (newVersion, newFlavor), + not oldVersion)] cs = repos.createChangeSet(list) cs.writeToFile(outFileName) From ewt@specifixinc.com Thu Aug 5 18:13:29 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MDTbI014598 for ; Thu, 5 Aug 2004 18:13:29 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 365EF162A1 for ; Thu, 5 Aug 2004 15:13:56 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MDjTD018320; Thu, 5 Aug 2004 18:13:45 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75MDjO2018317; Thu, 5 Aug 2004 18:13:45 -0400 Date: Thu, 5 Aug 2004 18:13:45 -0400 From: ewt@specifixinc.com Message-Id: <200408052213.i75MDjO2018317@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.132,1.133 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:13:29 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18282 Modified Files: trove.py Log Message: fixes for Trove.diff() between troves of different flavors Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- trove.py 5 Aug 2004 21:53:19 -0000 1.132 +++ trove.py 5 Aug 2004 22:13:43 -0000 1.133 @@ -265,7 +265,6 @@ """ assert(not them or self.name == them.name) - assert(not them or self.flavor == them.flavor) # find all of the file ids which have been added, removed, and # stayed the same @@ -426,7 +425,7 @@ if match: changePair.append((name, added[name][newFlavor], newFlavor, - removed[name][oldFlavor], oldFlavor)) + match, oldFlavor)) del added[name][newFlavor] continue @@ -671,9 +670,9 @@ if self.provides: depformat('Provides', self.provides, f) if self.oldFlavor: - depformat('Old Flavor', self.flavor, f) + depformat('Old Flavor', self.oldFlavor, f) if self.newFlavor: - depformat('New Flavor', self.flavor, f) + depformat('New Flavor', self.newFlavor, f) for (fileId, path, version) in self.newFiles: #f.write("\tadded (%s(.*)%s)\n" % (fileId[:6], fileId[-6:])) From ewt@specifixinc.com Thu Aug 5 18:25:41 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MPfbI014621 for ; Thu, 5 Aug 2004 18:25:41 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 59163162A1 for ; Thu, 5 Aug 2004 15:26:08 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MQ5TD018736; Thu, 5 Aug 2004 18:26:05 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75MQ5tv018725; Thu, 5 Aug 2004 18:26:05 -0400 Date: Thu, 5 Aug 2004 18:26:05 -0400 From: ewt@specifixinc.com Message-Id: <200408052226.i75MQ5tv018725@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local database.py, 1.133, 1.134 localrep.py, 1.22, 1.23 update.py, 1.118, 1.119 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:25:41 -0000 Update of /cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18703/local Modified Files: database.py localrep.py update.py Log Message: got rid of TroveChangeSet.getFlavor() since there are now old and new flavors Index: database.py =================================================================== RCS file: /cvs/conary/local/database.py,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- database.py 5 Aug 2004 21:53:19 -0000 1.133 +++ database.py 5 Aug 2004 22:26:03 -0000 1.134 @@ -333,7 +333,7 @@ for newPkg in cs.iterNewPackageList(): name = newPkg.getName() old = newPkg.getOldVersion() - flavor = newPkg.getFlavor() + flavor = newPkg.getOldFlavor() if self.hasPackage(name) and old: ver = old.fork(versions.LocalBranch(), sameVerRel = 1) pkg = self.getTrove(name, old, flavor) Index: localrep.py =================================================================== RCS file: /cvs/conary/local/localrep.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- localrep.py 2 Aug 2004 21:16:14 -0000 1.22 +++ localrep.py 5 Aug 2004 22:26:03 -0000 1.23 @@ -97,9 +97,9 @@ # a new package. no need to erase any old stuff then! continue - assert(repos.hasTrove(name, oldVersion, csPkg.getFlavor())) + assert(repos.hasTrove(name, oldVersion, csPkg.getOldFlavor())) - oldPkg = repos.getTrove(name, oldVersion, csPkg.getFlavor()) + oldPkg = repos.getTrove(name, oldVersion, csPkg.getOldFlavor()) self.oldPackage(oldPkg) for fileId in csPkg.getOldFileList(): Index: update.py =================================================================== RCS file: /cvs/conary/local/update.py,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- update.py 5 Aug 2004 21:25:10 -0000 1.118 +++ update.py 5 Aug 2004 22:26:03 -0000 1.119 @@ -312,7 +312,7 @@ fsPkg = fsPkg.copy() else: fsPkg = trove.Trove(pkgCs.getName(), versions.NewVersion(), - pkgCs.getFlavor(), pkgCs.getChangeLog()) + pkgCs.getNewFlavor(), pkgCs.getChangeLog()) fsPkg.mergeTroveListChanges(pkgCs.iterChangedTroves(), redundantOkay = True) @@ -395,7 +395,7 @@ # the file was removed from the local system; this change # wins self.userRemoval(pkgCs.getName(), pkgCs.getNewVersion(), - pkgCs.getFlavor(), fileId) + pkgCs.getNewFlavor(), fileId) continue (fsPath, fsVersion) = fsPkg.getFile(fileId) @@ -510,7 +510,8 @@ if headFileContType == changeset.ChangedFileTypes.diff: sha1 = baseFile.contents.sha1() baseLineF = repos.getFileContents(pkgCs.getName(), - pkgCs.getOldVersion(), pkgCs.getFlavor(), + pkgCs.getOldVersion(), + pkgCs.getOldFlavor(), basePkg.getFile(fileId)[0], basePkg.getFile(fileId)[1]).get() @@ -638,7 +639,7 @@ old = pkgCs.getOldVersion() if old: localVer = old.fork(versions.LocalBranch(), sameVerRel = 1) - basePkg = repos.getTrove(name, old, pkgCs.getFlavor()) + basePkg = repos.getTrove(name, old, pkgCs.getOldFlavor()) pkg = self._singlePackage(repos, pkgCs, changeSet, basePkg, fsPkgDict[(name, localVer)], root, flags) self.oldPackages.append((basePkg.getName(), From ewt@specifixinc.com Thu Aug 5 18:25:41 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MPfbI014622 for ; Thu, 5 Aug 2004 18:25:41 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 7DB1616762 for ; Thu, 5 Aug 2004 15:26:08 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MQ5TD018730; Thu, 5 Aug 2004 18:26:05 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75MQ5su018721; Thu, 5 Aug 2004 18:26:05 -0400 Date: Thu, 5 Aug 2004 18:26:05 -0400 From: ewt@specifixinc.com Message-Id: <200408052226.i75MQ5su018721@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.133,1.134 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:25:42 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18703 Modified Files: trove.py Log Message: got rid of TroveChangeSet.getFlavor() since there are now old and new flavors Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- trove.py 5 Aug 2004 22:13:43 -0000 1.133 +++ trove.py 5 Aug 2004 22:26:03 -0000 1.134 @@ -41,6 +41,9 @@ def changeVersion(self, version): self.version = version + def changeFlavor(self, flavor): + self.flavor = flavor + def addFile(self, fileId, path, version): self.idMap[fileId] = (path, version) @@ -190,11 +193,12 @@ self.removeFile(fileId) self.mergeTroveListChanges(pkgCS.iterChangedTroves()) - self.flavor = pkgCS.getFlavor() + self.flavor = pkgCS.getNewFlavor() self.changeLog = pkgCS.getChangeLog() self.setProvides(pkgCS.getProvides()) self.setRequires(pkgCS.getRequires()) self.changeVersion(pkgCS.getNewVersion()) + self.changeFlavor(pkgCS.getNewFlavor()) return fileMap @@ -809,9 +813,6 @@ def getNewFlavor(self): return self.newFlavor - def getFlavor(self): - return self.newFlavor - def __init__(self, name, changeLog, oldVersion, newVersion, oldFlavor, newFlavor, absolute = 0): assert(isinstance(newVersion, versions.AbstractVersion)) From ewt@specifixinc.com Thu Aug 5 18:25:43 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MPhbI014633 for ; Thu, 5 Aug 2004 18:25:43 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 7490A162A1 for ; Thu, 5 Aug 2004 15:26:10 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MQ6TD018740; Thu, 5 Aug 2004 18:26:06 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75MQ5cG018732; Thu, 5 Aug 2004 18:26:05 -0400 Date: Thu, 5 Aug 2004 18:26:05 -0400 From: ewt@specifixinc.com Message-Id: <200408052226.i75MQ5cG018732@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py, 1.143, 1.144 netclient.py, 1.43, 1.44 repository.py, 1.161, 1.162 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:25:44 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18703/repository Modified Files: changeset.py netclient.py repository.py Log Message: got rid of TroveChangeSet.getFlavor() since there are now old and new flavors Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- changeset.py 5 Aug 2004 21:53:19 -0000 1.143 +++ changeset.py 5 Aug 2004 22:26:03 -0000 1.144 @@ -118,7 +118,7 @@ assert(min(new.timeStamps()) > 0) self.newPackages[(csPkg.getName(), csPkg.getNewVersion(), - csPkg.getFlavor())] = csPkg + csPkg.getNewFlavor())] = csPkg if csPkg.isAbsolute(): self.absolute = 1 @@ -293,11 +293,11 @@ # this was a new package, and the inverse of a new # package is an old package rollback.oldPackage(pkgCs.getName(), pkgCs.getNewVersion(), - pkgCs.getFlavor()) + pkgCs.getNewFlavor()) continue pkg = db.getTrove(pkgCs.getName(), pkgCs.getOldVersion(), - pkgCs.getFlavor()) + pkgCs.getOldFlavor()) # this is a modified package and needs to be inverted Index: netclient.py =================================================================== RCS file: /cvs/conary/repository/netclient.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- netclient.py 5 Aug 2004 21:53:19 -0000 1.43 +++ netclient.py 5 Aug 2004 22:26:03 -0000 1.44 @@ -256,7 +256,7 @@ continue t = trove.Trove(pkgCs.getName(), pkgCs.getOldVersion(), - pkgCs.getFlavor(), pkgCs.getChangeLog()) + pkgCs.getNewFlavor(), pkgCs.getChangeLog()) t.applyChangeSet(pkgCs) l.append(t) Index: repository.py =================================================================== RCS file: /cvs/conary/repository/repository.py,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- repository.py 5 Aug 2004 21:20:51 -0000 1.161 +++ repository.py 5 Aug 2004 22:26:03 -0000 1.162 @@ -588,20 +588,20 @@ old = csPkg.getOldVersion() oldTroveVersion = old pkgName = csPkg.getName() - troveFlavor = csPkg.getFlavor() + troveFlavor = csPkg.getNewFlavor() - if repos.hasTrove(pkgName, newVersion, csPkg.getFlavor()): + if repos.hasTrove(pkgName, newVersion, troveFlavor): raise CommitError, \ "version %s of %s is already installed" % \ (newVersion.asString(), csPkg.getName()) if old: - newPkg = repos.getTrove(pkgName, old, csPkg.getFlavor(), + newPkg = repos.getTrove(pkgName, old, csPkg.getOldFlavor(), pristine = True) newPkg.changeVersion(newVersion) else: newPkg = trove.Trove(csPkg.getName(), newVersion, - csPkg.getFlavor(), csPkg.getChangeLog()) + troveFlavor, csPkg.getChangeLog()) newFileMap = newPkg.applyChangeSet(csPkg) From ewt@specifixinc.com Thu Aug 5 18:32:41 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MWfbI014648 for ; Thu, 5 Aug 2004 18:32:41 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 69C5C162A1 for ; Thu, 5 Aug 2004 15:33:08 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MX3TD019050; Thu, 5 Aug 2004 18:33:03 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75MX3Yx019047; Thu, 5 Aug 2004 18:33:03 -0400 Date: Thu, 5 Aug 2004 18:33:03 -0400 From: ewt@specifixinc.com Message-Id: <200408052233.i75MX3Yx019047@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.134,1.135 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:32:41 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv19033 Modified Files: trove.py Log Message: need to return the old flavor when it's asked for, not the new one Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- trove.py 5 Aug 2004 22:26:03 -0000 1.134 +++ trove.py 5 Aug 2004 22:33:01 -0000 1.135 @@ -808,7 +808,7 @@ return self.requires def getOldFlavor(self): - return self.newFlavor + return self.oldFlavor def getNewFlavor(self): return self.newFlavor From ewt@specifixinc.com Thu Aug 5 18:35:15 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MZFbI014656 for ; Thu, 5 Aug 2004 18:35:15 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 56539162A1 for ; Thu, 5 Aug 2004 15:35:42 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i75MZeTD019176; Thu, 5 Aug 2004 18:35:40 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i75MZeos019173; Thu, 5 Aug 2004 18:35:40 -0400 Date: Thu, 5 Aug 2004 18:35:40 -0400 From: ewt@specifixinc.com Message-Id: <200408052235.i75MZeos019173@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.135,1.136 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 22:35:15 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv19161 Modified Files: trove.py Log Message: support old format change sets for a little while Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- trove.py 5 Aug 2004 22:33:01 -0000 1.135 +++ trove.py 5 Aug 2004 22:35:38 -0000 1.136 @@ -912,7 +912,16 @@ newFlavor = None for i, l in enumerate(lines[1:4]): if l.startswith("FLAVOR "): - oldFlavorStr, newFlavorStr = l.split(' ', 2)[1:3] + lst = l.split(' ') + + ### for backwards compatibility + if len(lst) == 2: + oldFlavorStr = lst[1] + newFlavorStr = oldFlavorStr + elif len(lst) == 3: + oldFlavorStr, newFlavorStr = lst[1:3] + else: + assert(0) if oldFlavorStr != "-": oldFlavor = deps.ThawDependencySet(oldFlavorStr) From dbc@specifixinc.com Fri Aug 6 10:25:00 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76EOxbI016013 for ; Fri, 6 Aug 2004 10:24:59 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 5F03516761 for ; Fri, 6 Aug 2004 07:25:27 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76EPOTD003111; Fri, 6 Aug 2004 10:25:24 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76EPO5b003109; Fri, 6 Aug 2004 10:25:24 -0400 Date: Fri, 6 Aug 2004 10:25:24 -0400 From: David Christian Message-Id: <200408061425.i76EPO5b003109@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/scripts Precedence: first-class Cc: Subject: conary/scripts showpathconflicts,NONE,1.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 14:25:00 -0000 Update of /cvs/conary/scripts In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv3087 Added Files: showpathconflicts Log Message: Script to show what file on your local machine is owned by multiple troves --- NEW FILE showpathconflicts --- #!/usr/bin/python2.3 # -*- mode: python -*- # # Copyright (c) 2004 Specifix, Inc. # # This program is distributed under the terms of the Common Public License, # version 1.0. A copy of this license should have been distributed with this # source file in a file called LICENSE. If it is not present, the license # is always available at http://www.opensource.org/licenses/cpl.php. # # This program is distributed in the hope that it will be useful, but # without any waranty; without even the implied warranty of merchantability # or fitness for a particular purpose. See the Common Public License for # full details. # import os import sys if os.path.dirname(sys.argv[0]): if sys.argv[0][0] == "/": fullPath = os.path.dirname(sys.argv[0]) else: fullPath = os.getcwd() + "/" + os.path.dirname(sys.argv[0]) else: fullPath = os.getcwd() sys.path.append(os.path.dirname(fullPath)) import conarycfg from local import database import util sys.excepthook = util.excepthook def main(): cfg = conarycfg.ConaryConfiguration() db = database.Database(cfg.root, cfg.dbPath) displayConflicts(db, cfg) def displayConflicts(db, cfg): for (trove1, trove2, path) in iterPathConflicts(db.db): print "%-20s %-20s %-30s" % (trove1[0], trove2[0], path) def iterPathConflicts(sqldb_obj): cu = sqldb_obj.db.cursor() cu.execute("""SELECT a.instanceId,b.instanceId,a.path FROM DBTroveFiles AS a, DBTroveFiles AS b WHERE a.path=b.path AND a.instanceId != b.instanceID AND a.isPresent=1 AND b.isPresent=1 AND a.instanceID <= b.instanceID""") for row in cu: troveId1 = sqldb_obj.instances.getId(row[0]) troveId2 = sqldb_obj.instances.getId(row[1]) yield (troveId1, troveId2, row[2]) main() From bcrl@specifixinc.com Fri Aug 6 10:36:15 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76EaFbI016031 for ; Fri, 6 Aug 2004 10:36:15 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3708116761 for ; Fri, 6 Aug 2004 07:36:43 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76EafTD003418; Fri, 6 Aug 2004 10:36:41 -0400 Received: (from bcrl@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76EafYt003400; Fri, 6 Aug 2004 10:36:41 -0400 Date: Fri, 6 Aug 2004 10:36:41 -0400 From: bcrl@specifixinc.com Message-Id: <200408061436.i76EafYt003400@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/pysqlite Precedence: first-class X-Mailman-Approved-At: Fri, 06 Aug 2004 10:37:46 -0400 Cc: Subject: conary/pysqlite _sqlite.c,1.5,1.6 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 14:36:15 -0000 Update of /spx/cvs/conary/pysqlite In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv3367/pysqlite Modified Files: _sqlite.c Log Message: fix legit uninitialized variable warning Index: _sqlite.c =================================================================== RCS file: /spx/cvs/conary/pysqlite/_sqlite.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- _sqlite.c 21 Jun 2004 18:58:20 -0000 1.5 +++ _sqlite.c 6 Aug 2004 14:36:39 -0000 1.6 @@ -1462,7 +1462,7 @@ PyObject* type_code; PyObject* converters; PyObject* converted; - PyObject* expected_type_name; + PyObject* expected_type_name = NULL; PyObject* callable; PyObject* callable_args; int i; From msw@specifixinc.com Fri Aug 6 11:34:54 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76FYrbI016248 for ; Fri, 6 Aug 2004 11:34:53 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 2B08D16761 for ; Fri, 6 Aug 2004 08:35:21 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76FZJTD005641; Fri, 6 Aug 2004 11:35:19 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76FZJPo005638; Fri, 6 Aug 2004 11:35:19 -0400 Date: Fri, 6 Aug 2004 11:35:19 -0400 From: Matt Wilson Message-Id: <200408061535.i76FZJPo005638@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary Makefile,1.70,1.71 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 15:34:54 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv5626 Modified Files: Makefile Log Message: 0.6.4 Index: Makefile =================================================================== RCS file: /mnt/specifix/cvs/conary/Makefile,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- Makefile 5 Aug 2004 21:21:00 -0000 1.70 +++ Makefile 6 Aug 2004 15:35:17 -0000 1.71 @@ -14,7 +14,7 @@ all: subdirs conary-wrapper -export VERSION = 0.6.3 +export VERSION = 0.6.4 export TOPDIR = $(shell pwd) export DISTDIR = $(TOPDIR)/conary-$(VERSION) export prefix = /usr From ewt@specifixinc.com Fri Aug 6 13:21:26 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HLQbI016509 for ; Fri, 6 Aug 2004 13:21:26 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id C58FF16744 for ; Fri, 6 Aug 2004 10:21:53 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HLnTD007735; Fri, 6 Aug 2004 13:21:49 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76HLnAG007727; Fri, 6 Aug 2004 13:21:49 -0400 Date: Fri, 6 Aug 2004 13:21:49 -0400 From: ewt@specifixinc.com Message-Id: <200408061721.i76HLnAG007727@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary filecontainer.py,1.31,1.32 trove.py,1.136,1.137 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 17:21:26 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv7707 Modified Files: filecontainer.py trove.py Log Message: 1. removed compatibility for version 1 changesets 2. added Sha1Stream for expansion Index: filecontainer.py =================================================================== RCS file: /cvs/conary/filecontainer.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- filecontainer.py 5 Aug 2004 21:54:07 -0000 1.31 +++ filecontainer.py 6 Aug 2004 17:21:46 -0000 1.32 @@ -174,9 +174,9 @@ if len(version) != 2: raise BadContainer, "invalid container version" version = struct.unpack("!H", version)[0] - if version != FILE_CONTAINER_VERSION and version != 1: - raise BadContainer, "unknown file container version %d" % version - self.version = version + if version != FILE_CONTAINER_VERSION: + raise BadContainer, "unsupported file container version %d" % \ + version self.gzfile = gzip.GzipFile(None, "rb", None, self.file) @@ -226,36 +226,19 @@ util.copyfileobj(fileObj, self.rest) def getNextFile(self): - if self.version == 1: - self.lastFetched += 1 - if self.lastFetched == len(self.entryOrder): - return None - - entry = self.entries[self.entryOrder[self.lastFetched]] - size = entry.size - tag = entry.data - name = entry.name - - pos = self.gzfile.tell() - offset = entry.offset + self.contentsStart - if (pos != offset): - assert(pos < offset) - self.gzfile.seek(offset) # this is always SEEK_SET - assert(self.gzfile.tell() == offset) - else: - eatCount = self.next - self.gzfile.tell() + eatCount = self.next - self.gzfile.tell() - # in case the file wasn't completely read in (it may have - # already been in the repository, for example) - while eatCount > self.bufSize: - self.gzfile.read(self.bufSize) - eatCount -= self.bufSize - self.gzfile.read(eatCount) + # in case the file wasn't completely read in (it may have + # already been in the repository, for example) + while eatCount > self.bufSize: + self.gzfile.read(self.bufSize) + eatCount -= self.bufSize + self.gzfile.read(eatCount) - name, tag, size = self.nextFile() + name, tag, size = self.nextFile() - if name is None: - return None + if name is None: + return None fcf = FileContainerFile(self.gzfile, size) self.next = self.gzfile.tell() + size @@ -268,43 +251,26 @@ # small number of functions assert(not self.mutable) - if self.version == 1: - if not self.entries.has_key(fileName): - raise KeyError, ("file %s is not in the collection") % fileName - - entry = self.entries[fileName] - self.lastFetched = self.entryOrder.index(fileName) - - pos = self.gzfile.tell() - offset = entry.offset + self.contentsStart - if (pos != offset): - assert(pos < offset) - self.gzfile.seek(offset) # this is always SEEK_SET - assert(self.gzfile.tell() == offset) + eatCount = self.next - self.gzfile.tell() - size = entry.size - tag = entry.data - else: - eatCount = self.next - self.gzfile.tell() - - # in case the file wasn't completely read in (it may have - # already been in the repository, for example) - while eatCount > self.bufSize: + # in case the file wasn't completely read in (it may have + # already been in the repository, for example) + while eatCount > self.bufSize: + self.gzfile.read(self.bufSize) + eatCount -= self.bufSize + self.gzfile.read(eatCount) + + name, tag, size = self.nextFile() + while (name and name != fileName): + while size > self.bufSize: self.gzfile.read(self.bufSize) - eatCount -= self.bufSize - self.gzfile.read(eatCount) + size -= self.bufSize + self.gzfile.read(size) name, tag, size = self.nextFile() - while (name and name != fileName): - while size > self.bufSize: - self.gzfile.read(self.bufSize) - size -= self.bufSize - self.gzfile.read(size) - - name, tag, size = self.nextFile() - if not name: - raise KeyError, ("file %s is not in the collection") % fileName + if not name: + raise KeyError, ("file %s is not in the collection") % fileName fcf = FileContainerFile(self.gzfile, size) self.next = self.gzfile.tell() + size Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- trove.py 5 Aug 2004 22:35:38 -0000 1.136 +++ trove.py 6 Aug 2004 17:21:46 -0000 1.137 @@ -888,7 +888,8 @@ # this makes our order match the order in the changeset self.changedFiles.sort() - def __init__(self, lines): + def __init__(self, buf): + lines = buf.split("\n")[:-1] header = lines[0] l = header.split() @@ -912,16 +913,8 @@ newFlavor = None for i, l in enumerate(lines[1:4]): if l.startswith("FLAVOR "): - lst = l.split(' ') - - ### for backwards compatibility - if len(lst) == 2: - oldFlavorStr = lst[1] - newFlavorStr = oldFlavorStr - elif len(lst) == 3: - oldFlavorStr, newFlavorStr = lst[1:3] - else: - assert(0) + lst = l.split(' ', 2) + oldFlavorStr, newFlavorStr = lst[1:3] if oldFlavorStr != "-": oldFlavor = deps.ThawDependencySet(oldFlavorStr) From ewt@specifixinc.com Fri Aug 6 13:21:26 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HLQbI016510 for ; Fri, 6 Aug 2004 13:21:26 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 6479C16762 for ; Fri, 6 Aug 2004 10:21:54 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HLnTD007736; Fri, 6 Aug 2004 13:21:49 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76HLnsp007731; Fri, 6 Aug 2004 13:21:49 -0400 Date: Fri, 6 Aug 2004 13:21:49 -0400 From: ewt@specifixinc.com Message-Id: <200408061721.i76HLnsp007731@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.144,1.145 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 17:21:27 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv7707/repository Modified Files: changeset.py Log Message: 1. removed compatibility for version 1 changesets 2. added Sha1Stream for expansion Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- changeset.py 5 Aug 2004 22:26:03 -0000 1.144 +++ changeset.py 6 Aug 2004 17:21:46 -0000 1.145 @@ -627,8 +627,7 @@ elif header.startswith("PKG "): size = int(header.split()[1]) buf = control.read(size) - lines = buf.split("\n")[:-1] - pkg = trove.ThawTroveChangeSet(lines) + pkg = trove.ThawTroveChangeSet(buf) self.newPackage(pkg) elif header.startswith("FILES "): size = int(header.split()[1]) From dbc@specifixinc.com Fri Aug 6 13:30:11 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HUBbI016641 for ; Fri, 6 Aug 2004 13:30:11 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id DA87116744 for ; Fri, 6 Aug 2004 10:30:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HUaTD008063; Fri, 6 Aug 2004 13:30:37 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76HUaIT008058; Fri, 6 Aug 2004 13:30:36 -0400 Date: Fri, 6 Aug 2004 13:30:36 -0400 From: David Christian Message-Id: <200408061730.i76HUaIT008058@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build action.py,1.10,1.11 build.py,1.176,1.177 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 17:30:11 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv8046 Modified Files: action.py build.py Log Message: Allow for stacked excepthook overrides Index: action.py =================================================================== RCS file: /cvs/conary/build/action.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- action.py 5 Aug 2004 22:09:32 -0000 1.10 +++ action.py 6 Aug 2004 17:30:34 -0000 1.11 @@ -152,10 +152,11 @@ if self.linenum is None: self.do() else: + oldexcepthook = sys.excepthook sys.excepthook = excepthook actionobject = self self.do() - sys.excepthook = sys.__excepthook__ + sys.excepthook = oldexcepthook def do(self): Index: build.py =================================================================== RCS file: /cvs/conary/build/build.py,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- build.py 5 Aug 2004 22:09:32 -0000 1.176 +++ build.py 6 Aug 2004 17:30:34 -0000 1.177 @@ -66,10 +66,11 @@ if self.linenum is None: self.do(self.recipe.macros) else: + oldexcepthook = sys.excepthook sys.excepthook = action.excepthook action.actionobject = self self.do(self.recipe.macros) - sys.excepthook = sys.__excepthook__ + sys.excepthook = oldexcepthook def do(self, macros): """ From dbc@specifixinc.com Fri Aug 6 13:36:27 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HaQbI016656 for ; Fri, 6 Aug 2004 13:36:26 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 7DDED16744 for ; Fri, 6 Aug 2004 10:36:54 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HarTD008572; Fri, 6 Aug 2004 13:36:53 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76Harav008567; Fri, 6 Aug 2004 13:36:53 -0400 Date: Fri, 6 Aug 2004 13:36:53 -0400 From: David Christian Message-Id: <200408061736.i76Harav008567@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build recipe.py,1.231,1.232 use.py,1.60,1.61 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 17:36:27 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv8534/build Modified Files: recipe.py use.py Log Message: Add ability to update local recipe flags through command line. Make local flags writeable only during class initialization phase. Index: recipe.py =================================================================== RCS file: /cvs/conary/build/recipe.py,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- recipe.py 5 Aug 2004 21:10:42 -0000 1.231 +++ recipe.py 6 Aug 2004 17:36:50 -0000 1.232 @@ -307,7 +307,7 @@ class PackageRecipe(Recipe): buildRequires = [] - Flags = use.Flag(showdefaults=True) + Flags = use.LocalFlags def mainDir(self, new = None): if new: Index: use.py =================================================================== RCS file: /cvs/conary/build/use.py,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- use.py 5 Aug 2004 20:15:34 -0000 1.60 +++ use.py 6 Aug 2004 17:36:50 -0000 1.61 @@ -354,17 +354,48 @@ Arch._freeze() _addDocs(Arch) -def track(arg, localflags=None): +class LocalFlag(Flag): + + _overrides = {} + + def __init__(self): + Flag.__init__(self, showdefaults=False) + self._cfg = None + self._name = None + + def _override(self, key, value): + self._overrides[key] = value + + def __getattr__(self, name): + if name in self.__dict__: + return self.__dict__[name] + if name in self or name in self._overrides: + if name in self._overrides: + flag = self._overrides[name] + else: + flag = self[name] + if self._track: + self._usedFlags[name] = flag + return flag + raise AttributeError, "class %s has no attribute '%s'" % (self.__class__.__name__, name) + +LocalFlags = LocalFlag() + +def track(arg): """ Turns Use flag tracking on or off. """ Arch.trackUsed(arg) Use.trackUsed(arg) - if localflags is not None: - localflags.trackUsed(arg) + LocalFlags.trackUsed(arg) -def applyCfg(config, localflags=None): +def overrideFlags(config, pkgname): Use._thaw() for key in config.useKeys(): Use[key] = config['Use.' + key] + + prefix = 'Flags.%s.' % pkgname + for key in config.pkgKeys(pkgname): + LocalFlags._override(key, config[prefix + key]) + Use._freeze() From dbc@specifixinc.com Fri Aug 6 13:36:27 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HaRbI016658 for ; Fri, 6 Aug 2004 13:36:27 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id F1A0B16762 for ; Fri, 6 Aug 2004 10:36:54 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HarTD008571; Fri, 6 Aug 2004 13:36:53 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76Haql0008562; Fri, 6 Aug 2004 13:36:52 -0400 Date: Fri, 6 Aug 2004 13:36:52 -0400 From: David Christian Message-Id: <200408061736.i76Haql0008562@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary conarycfg.py,1.60,1.61 cook.py,1.215,1.216 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 17:36:27 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv8534 Modified Files: conarycfg.py cook.py Log Message: Add ability to update local recipe flags through command line. Make local flags writeable only during class initialization phase. Index: conarycfg.py =================================================================== RCS file: /cvs/conary/conarycfg.py,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- conarycfg.py 5 Aug 2004 20:15:34 -0000 1.60 +++ conarycfg.py 6 Aug 2004 17:36:50 -0000 1.61 @@ -189,7 +189,7 @@ return self.useflags.keys() def pkgKeys(self, pkg): - return self.pkgdefaults.get(pkg, {}).keys() + return self.pkgflags.get(pkg, {}).keys() class ConaryCfgError(Exception): Index: cook.py =================================================================== RCS file: /cvs/conary/cook.py,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- cook.py 5 Aug 2004 22:09:32 -0000 1.215 +++ cook.py 6 Aug 2004 17:36:50 -0000 1.216 @@ -402,7 +402,8 @@ recipeObj.populateLcache() builddir = cfg.buildPath + "/" + recipeObj.name - use.track(True, recipeObj.Flags) + use.track(True) + recipeObj.Flags._freeze() recipeObj.setup() bldInfo = buildinfo.BuildInfo(builddir) @@ -438,7 +439,7 @@ log.info('Processing %s', recipeClass.name) recipeObj.doDestdirProcess() # includes policy bldInfo.stop() - use.track(False, recipeObj.Flags) + use.track(False) finally: os.chdir(cwd) @@ -532,7 +533,6 @@ buildList = [] changeSetFile = None targetLabel = None - use.applyCfg(cfg) if item.endswith('.recipe') and os.path.isfile(item): if emerge: @@ -544,6 +544,9 @@ if recipeFile[0] != '/': recipeFile = "%s/%s" % (os.getcwd(), recipeFile) + pkgname = recipeFile.split('/')[-1].split('.')[0] + use.overrideFlags(cfg, pkgname) + try: loader = recipe.RecipeLoader(recipeFile, cfg=cfg, repos=repos) except recipe.RecipeFileError, msg: @@ -557,6 +560,8 @@ versionList = versionDict[srcName] targetLabel = versions.CookBranch() else: + use.overrideFlags(cfg, item) + if resume: raise CookError('Cannot use --resume argument when cooking in repository') try: From johnsonm@specifixinc.com Fri Aug 6 13:37:20 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HbKbI016670 for ; Fri, 6 Aug 2004 13:37:20 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 68F7D16744 for ; Fri, 6 Aug 2004 10:37:48 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HbkTD008693; Fri, 6 Aug 2004 13:37:46 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76Hbkd9008690; Fri, 6 Aug 2004 13:37:46 -0400 Date: Fri, 6 Aug 2004 13:37:46 -0400 From: johnsonm@specifixinc.com Message-Id: <200408061737.i76Hbkd9008690@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build packagepolicy.py,1.117,1.118 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 17:37:20 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv8672 Modified Files: packagepolicy.py Log Message: more unification of library handling, making CheckSonames more useful Index: packagepolicy.py =================================================================== RCS file: /spx/cvs/conary/build/packagepolicy.py,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- packagepolicy.py 5 Aug 2004 00:41:41 -0000 1.117 +++ packagepolicy.py 6 Aug 2004 17:37:44 -0000 1.118 @@ -102,7 +102,12 @@ C{r.CheckSonames(exceptions=I{filterexp})} for things like directories full of plugins. """ - invariantinclusions = [ (r'..*\.so', None, stat.S_IFDIR), ] + invariantsubtrees = destdirpolicy.librarydirs + invariantinclusions = [ + (r'..*\.so', None, stat.S_IFDIR), + ] + recursive = False + def doFile(self, path): d = self.macros.destdir destlen = len(d) @@ -380,10 +385,11 @@ ] recursive = False - # needs to share with ExecutableLibraries + # needs to share with ExecutableLibraries and CheckSonames def updateArgs(self, *args, **keywords): policy.updateArgs(self, *args, **keywords) self.recipe.ExecutableLibraries(*args, **keywords) + self.recipe.CheckSonames(*args, **keywords) def doFile(self, file): fullpath = ('%(destdir)s/'+file) %self.macros From dbc@specifixinc.com Fri Aug 6 13:52:45 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HqibI016706 for ; Fri, 6 Aug 2004 13:52:44 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 92BA116744 for ; Fri, 6 Aug 2004 10:53:12 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76HrATD009202; Fri, 6 Aug 2004 13:53:10 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76HrA0H009199; Fri, 6 Aug 2004 13:53:10 -0400 Date: Fri, 6 Aug 2004 13:53:10 -0400 From: David Christian Message-Id: <200408061753.i76HrA0H009199@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build use.py,1.61,1.62 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 17:52:45 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv9165 Modified Files: use.py Log Message: Refactor, combining overrides into Flag class Index: use.py =================================================================== RCS file: /cvs/conary/build/use.py,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- use.py 6 Aug 2004 17:36:50 -0000 1.61 +++ use.py 6 Aug 2004 17:53:08 -0000 1.62 @@ -39,6 +39,7 @@ self._frozen = False self._track = False self._usedFlags = {} + self._overrides = {} # this must be set last self._initialized = True @@ -85,6 +86,9 @@ def _thaw(self): self._frozen = False + def _override(self, key, value): + self._overrides[key] = value + def getUsed(self): return self._usedFlags @@ -102,8 +106,11 @@ def __getattr__(self, name): if name in self.__dict__: return self.__dict__[name] - if name in self: - flag = self[name] + if name in self or name in self._overrides: + if name in self._overrides: + flag = self._overrides[name] + else: + flag = self[name] if self._track: self._usedFlags[name] = flag return flag @@ -354,32 +361,7 @@ Arch._freeze() _addDocs(Arch) -class LocalFlag(Flag): - - _overrides = {} - - def __init__(self): - Flag.__init__(self, showdefaults=False) - self._cfg = None - self._name = None - - def _override(self, key, value): - self._overrides[key] = value - - def __getattr__(self, name): - if name in self.__dict__: - return self.__dict__[name] - if name in self or name in self._overrides: - if name in self._overrides: - flag = self._overrides[name] - else: - flag = self[name] - if self._track: - self._usedFlags[name] = flag - return flag - raise AttributeError, "class %s has no attribute '%s'" % (self.__class__.__name__, name) - -LocalFlags = LocalFlag() +LocalFlags = Flag(showdefaults=False) def track(arg): """ @@ -392,7 +374,7 @@ def overrideFlags(config, pkgname): Use._thaw() for key in config.useKeys(): - Use[key] = config['Use.' + key] + Use._override(key, config['Use.' + key]) prefix = 'Flags.%s.' % pkgname for key in config.pkgKeys(pkgname): From ewt@specifixinc.com Fri Aug 6 14:42:42 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76IggbI016796 for ; Fri, 6 Aug 2004 14:42:42 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 59C8516744 for ; Fri, 6 Aug 2004 11:43:09 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76Ih5TD011076; Fri, 6 Aug 2004 14:43:05 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76Ih4km011072; Fri, 6 Aug 2004 14:43:04 -0400 Date: Fri, 6 Aug 2004 14:43:04 -0400 From: ewt@specifixinc.com Message-Id: <200408061843.i76Ih4km011072@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary files.py,1.157,1.158 streams.py,1.3,1.4 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 18:42:43 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv11058 Modified Files: files.py streams.py Log Message: factored StreamSet class out of File class Index: files.py =================================================================== RCS file: /cvs/conary/files.py,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- files.py 30 Jul 2004 20:51:22 -0000 1.157 +++ files.py 6 Aug 2004 18:43:02 -0000 1.158 @@ -217,23 +217,14 @@ return (self.val and self.val & flag) -def streamDictToList(d): - vals = d.keys() - m = max(vals) - l = range(m + 1) - for v in vals: - l[v] = d[v] - - return l - -class File(object): +class File(streams.StreamSet): lsTag = None hasContents = 0 streamDict = { streams._STREAM_INODE : (InodeStream, "inode"), streams._STREAM_FLAGS : (FlagsStream, "flags"), streams._STREAM_TAGS : (streams.StringsStream, "tags") } - streamList = streamDictToList(streamDict) + streamList = streams.streamSetDictToList(streamDict) __slots__ = [ "theId", "inode", "flags", "tags" ] def modeString(self): @@ -246,13 +237,6 @@ def sizeString(self): return " 0" - def copy(self): - new = copy.deepcopy(self) - for streamClass, name in self.streamDict.itervalues(): - stream = self.__getattribute__(name).copy() - new.__setattr__(name, stream) - return new - def id(self, new = None): if new: self.theId = new @@ -285,36 +269,6 @@ os.lchown(target, uid, gid) - def initializeStreams(self, data): - for streamType, name in self.streamDict.itervalues(): - self.__setattr__(name, streamType()) - - if data: - # skip over the file type for now - i = 1 - dataLen = len(data) - while i < dataLen: - assert(i < dataLen) - (streamId, size) = struct.unpack("!BH", data[i:i+3]) - (streamType, name) = self.streamList[streamId] - i += 3 - self.__setattr__(name, streamType(data[i:i + size])) - i += size - - assert(i == dataLen) - - def diff(self, other): - if self.lsTag != other.lsTag: - d = self.freeze() - return struct.pack("!BH", 0, len(d)) + d - - rc = [ "\x01", self.lsTag ] - for streamId, (streamType, name) in self.streamDict.iteritems(): - d = self.__getattribute__(name).diff(other.__getattribute__(name)) - rc.append(struct.pack("!BH", streamId, len(d)) + d) - - return "".join(rc) - def twm(self, diff, base, skip = None): sameType = struct.unpack("B", diff[0]) if not sameType: @@ -322,36 +276,12 @@ raise AssertionError assert(self.lsTag == base.lsTag) assert(self.lsTag == diff[1]) - i = 2 - conflicts = False - while i < len(diff): - streamId, size = struct.unpack("!BH", diff[i:i+3]) - - streamType, name = self.streamDict[streamId] - - i += 3 - if name != skip: - w = self.__getattribute__(name).twm(diff[i:i+size], - base.__getattribute__(name)) - conflicts = conflicts or w - i += size - - assert(i == len(diff)) - - return conflicts + return streams.StreamSet.twm(self, diff[2:], base, skip = skip) def __eq__(self, other): if other.lsTag != self.lsTag: return False - - for streamType, name in self.streamDict.itervalues(): - if not self.__getattribute__(name) == other.__getattribute__(name): - return False - - return True - - def __ne__(self, other): - return not self.__eq__(other) + return streams.StreamSet.__eq__(self, other) def metadataEqual(self, other, ignoreOwnerGroup): if not ignoreOwnerGroup: @@ -368,24 +298,22 @@ return True def freeze(self): - rc = [ self.lsTag ] - for streamId, (streamType, name) in self.streamDict.iteritems(): - s = self.__getattribute__(name).freeze() - if len(s): - rc.append(struct.pack("!BH", streamId, len(s)) + s) - return "".join(rc) + return self.lsTag + streams.StreamSet.freeze(self) def __init__(self, fileId, streamData = None): assert(self.__class__ is not File) self.theId = fileId - self.initializeStreams(streamData) + if streamData is not None: + streams.StreamSet.__init__(self, streamData[1:]) + else: + streams.StreamSet.__init__(self, None) class SymbolicLink(File): lsTag = "l" streamDict = { streams._STREAM_TARGET : (streams.StringStream, "target") } streamDict.update(File.streamDict) - streamList = streamDictToList(streamDict) + streamList = streams.streamSetDictToList(streamDict) __slots__ = "target" def sizeString(self): @@ -450,7 +378,7 @@ streamDict = { streams._STREAM_DEVICE : (DeviceStream, "devt") } streamDict.update(File.streamDict) - streamList = streamDictToList(streamDict) + streamList = streams.streamSetDictToList(streamDict) __slots__ = [ 'devt' ] def sizeString(self): @@ -491,7 +419,7 @@ streams._STREAM_FLAVOR : (streams.DependenciesStream, 'flavor' ) } streamDict.update(File.streamDict) - streamList = streamDictToList(streamDict) + streamList = streams.streamSetDictToList(streamDict) __slots__ = ('contents', 'provides', 'requires', 'flavor') lsTag = "-" Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- streams.py 30 Jul 2004 16:34:15 -0000 1.3 +++ streams.py 6 Aug 2004 18:43:02 -0000 1.4 @@ -15,6 +15,7 @@ Defines the datastreams stored in a changeset """ +import copy import struct from deps import filedeps, deps @@ -185,6 +186,13 @@ def __init__(self, s = ''): self.thaw(s) +class Sha1Stream(StringStream): + + # stores the sha1 as a binary, but can present it as a string + + def __str__(self): + return "%x%x%x%x%x" % struct.unpack("!5I", self.s) + class DependenciesStream(InfoStream): """ Stores list of strings; used for requires/provides lists @@ -392,3 +400,87 @@ items.append(itemType(all[i])) self.items = items +def streamSetDictToList(d): + vals = d.keys() + m = max(vals) + l = range(m + 1) + for v in vals: + l[v] = d[v] + + return l + +class StreamSet(object): + + def __init__(self, data = None): + for streamType, name in self.streamDict.itervalues(): + self.__setattr__(name, streamType()) + + if data: + i = 0 + dataLen = len(data) + while i < dataLen: + assert(i < dataLen) + (streamId, size) = struct.unpack("!BH", data[i:i+3]) + (streamType, name) = self.streamList[streamId] + i += 3 + self.__setattr__(name, streamType(data[i:i + size])) + i += size + + assert(i == dataLen) + + def diff(self, other): + if self.lsTag != other.lsTag: + d = self.freeze() + return struct.pack("!BH", 0, len(d)) + d + + rc = [ "\x01", self.lsTag ] + for streamId, (streamType, name) in self.streamDict.iteritems(): + d = self.__getattribute__(name).diff(other.__getattribute__(name)) + rc.append(struct.pack("!BH", streamId, len(d)) + d) + + return "".join(rc) + + def __eq__(self, other): + for streamType, name in self.streamDict.itervalues(): + if not self.__getattribute__(name) == other.__getattribute__(name): + return False + + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def freeze(self): + rc = [] + for streamId, (streamType, name) in self.streamDict.iteritems(): + s = self.__getattribute__(name).freeze() + if len(s): + rc.append(struct.pack("!BH", streamId, len(s)) + s) + return "".join(rc) + + def copy(self): + new = copy.deepcopy(self) + for streamClass, name in self.streamDict.itervalues(): + stream = self.__getattribute__(name).copy() + new.__setattr__(name, stream) + return new + + def twm(self, diff, base, skip = None): + i = 0 + conflicts = False + + while i < len(diff): + streamId, size = struct.unpack("!BH", diff[i:i+3]) + + streamType, name = self.streamDict[streamId] + + i += 3 + if name != skip: + w = self.__getattribute__(name).twm(diff[i:i+size], + base.__getattribute__(name)) + conflicts = conflicts or w + i += size + + assert(i == len(diff)) + + return conflicts From ewt@specifixinc.com Fri Aug 6 14:48:08 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76Im8bI016809 for ; Fri, 6 Aug 2004 14:48:08 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 31D1E16744 for ; Fri, 6 Aug 2004 11:48:36 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76ImLTD011403; Fri, 6 Aug 2004 14:48:21 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76ImLhM011400; Fri, 6 Aug 2004 14:48:21 -0400 Date: Fri, 6 Aug 2004 14:48:21 -0400 From: ewt@specifixinc.com Message-Id: <200408061848.i76ImLhM011400@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.4,1.5 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 18:48:08 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv11321 Modified Files: streams.py Log Message: InfoStream promised some methods which don't need to exist Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- streams.py 6 Aug 2004 18:43:02 -0000 1.4 +++ streams.py 6 Aug 2004 18:48:18 -0000 1.5 @@ -43,12 +43,6 @@ def diff(self, them): raise NotImplementedError - def set(self, val): - raise NotImplementedError - - def merge(self, val): - raise NotImplementedError - def twm(self, diff, base): """ Performs a three way merge. Base is the original information, @@ -409,7 +403,7 @@ return l -class StreamSet(object): +class StreamSet(InfoStream): def __init__(self, data = None): for streamType, name in self.streamDict.itervalues(): From dbc@specifixinc.com Fri Aug 6 15:03:48 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76J3mbI016830 for ; Fri, 6 Aug 2004 15:03:48 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 89DCB16744 for ; Fri, 6 Aug 2004 12:04:16 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76J4ETD011831; Fri, 6 Aug 2004 15:04:14 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76J4EBK011828; Fri, 6 Aug 2004 15:04:14 -0400 Date: Fri, 6 Aug 2004 15:04:14 -0400 From: David Christian Message-Id: <200408061904.i76J4EBK011828@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary util.py,1.70,1.71 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 19:03:48 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv11808 Modified Files: util.py Log Message: in copytree, basename doesn't work if the dir ends in '/' -- strip it off Index: util.py =================================================================== RCS file: /cvs/conary/util.py,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- util.py 3 Aug 2004 15:28:52 -0000 1.70 +++ util.py 6 Aug 2004 19:04:12 -0000 1.71 @@ -248,6 +248,8 @@ sourcelist = [] for source in braceGlob(sources): if os.path.isdir(source): + if source[-1] == '/': + source = source[:-1] thisdest = '%s%s%s' %(dest, os.sep, os.path.basename(source)) log.debug('copying [tree] %s to %s', source, thisdest) shutil.copytree(source, thisdest, symlinks) From dbc@specifixinc.com Fri Aug 6 15:07:13 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76J7DbI016841 for ; Fri, 6 Aug 2004 15:07:13 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id A27F516744 for ; Fri, 6 Aug 2004 12:07:41 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76J7eTD012081; Fri, 6 Aug 2004 15:07:40 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76J7dw4012078; Fri, 6 Aug 2004 15:07:39 -0400 Date: Fri, 6 Aug 2004 15:07:39 -0400 From: David Christian Message-Id: <200408061907.i76J7dw4012078@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary util.py,1.71,1.72 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 19:07:14 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv12038 Modified Files: util.py Log Message: make remove work like rm -f * -- i.e. don't error out if there's a subdir that we don't want to remove Index: util.py =================================================================== RCS file: /cvs/conary/util.py,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- util.py 6 Aug 2004 19:04:12 -0000 1.71 +++ util.py 6 Aug 2004 19:07:37 -0000 1.72 @@ -200,7 +200,9 @@ def remove(paths): for path in braceGlob(paths): - if os.path.exists(path) or os.path.islink(path): + if os.path.isdir(path): + log.warning('Not removing directory %s', path) + elif os.path.exists(path) or os.path.islink(path): log.debug('deleting [file] %s', path) os.remove(path) else: From msw@specifixinc.com Fri Aug 6 15:50:39 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76JocbI016920 for ; Fri, 6 Aug 2004 15:50:39 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 0CBD816744 for ; Fri, 6 Aug 2004 12:51:07 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76Jp5TD013405; Fri, 6 Aug 2004 15:51:05 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76Jp5rY013402; Fri, 6 Aug 2004 15:51:05 -0400 Date: Fri, 6 Aug 2004 15:51:05 -0400 From: Matt Wilson Message-Id: <200408061951.i76Jp5rY013402@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build source.py,1.29,1.30 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 19:50:39 -0000 Update of /mnt/specifix/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv13390 Modified Files: source.py Log Message: f is the correct variable name, not r Index: source.py =================================================================== RCS file: /mnt/specifix/cvs/conary/build/source.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- source.py 4 Aug 2004 01:11:01 -0000 1.29 +++ source.py 6 Aug 2004 19:51:03 -0000 1.30 @@ -178,7 +178,7 @@ return if f.endswith(".rpm"): - _extractFilesFromRPM(r, directory=destdir) + _extractFilesFromRPM(f, directory=destdir) return if f.endswith(".bz2") or f.endswith(".tbz2"): From msw@specifixinc.com Fri Aug 6 15:51:48 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76JpmbI016926 for ; Fri, 6 Aug 2004 15:51:48 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id A51B616744 for ; Fri, 6 Aug 2004 12:52:16 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76JqFTD013567; Fri, 6 Aug 2004 15:52:15 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76JqEOE013564; Fri, 6 Aug 2004 15:52:14 -0400 Date: Fri, 6 Aug 2004 15:52:14 -0400 From: Matt Wilson Message-Id: <200408061952.i76JqEOE013564@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary versions.py,1.80,1.81 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 19:51:49 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv13552 Modified Files: versions.py Log Message: correct typo: namespce->namespace Index: versions.py =================================================================== RCS file: /mnt/specifix/cvs/conary/versions.py,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- versions.py 1 Aug 2004 02:16:49 -0000 1.80 +++ versions.py 6 Aug 2004 19:52:12 -0000 1.81 @@ -293,7 +293,7 @@ return self.host def getNamespace(self): - return self.namespce + return self.namespace def __eq__(self, version): if (isinstance(version, BranchName) From dbc@specifixinc.com Fri Aug 6 16:50:06 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76Ko6bI016995 for ; Fri, 6 Aug 2004 16:50:06 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 2E71C16744 for ; Fri, 6 Aug 2004 13:50:34 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76KoWTD015382; Fri, 6 Aug 2004 16:50:32 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76KoWTG015379; Fri, 6 Aug 2004 16:50:32 -0400 Date: Fri, 6 Aug 2004 16:50:32 -0400 From: David Christian Message-Id: <200408062050.i76KoWTG015379@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/scripts Precedence: first-class Cc: Subject: conary/scripts showpathconflicts,1.1,1.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 20:50:06 -0000 Update of /cvs/conary/scripts In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15367 Modified Files: showpathconflicts Log Message: Documentation for showpathconflicts Index: showpathconflicts =================================================================== RCS file: /cvs/conary/scripts/showpathconflicts,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- showpathconflicts 6 Aug 2004 14:25:22 -0000 1.1 +++ showpathconflicts 6 Aug 2004 20:50:30 -0000 1.2 @@ -14,6 +14,9 @@ # full details. # +""" Shows those paths on your local system that are owned by multiple + packages """ + import os import sys if os.path.dirname(sys.argv[0]): From msw@specifixinc.com Fri Aug 6 16:51:23 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76KpMbI017001 for ; Fri, 6 Aug 2004 16:51:22 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id CD24416744 for ; Fri, 6 Aug 2004 13:51:50 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76KpnTD015524; Fri, 6 Aug 2004 16:51:49 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76KpnJs015521; Fri, 6 Aug 2004 16:51:49 -0400 Date: Fri, 6 Aug 2004 16:51:49 -0400 From: Matt Wilson Message-Id: <200408062051.i76KpnJs015521@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/scripts Precedence: first-class Cc: Subject: conary/scripts showpathconflicts,1.2,1.3 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 20:51:23 -0000 Update of /mnt/specifix/cvs/conary/scripts In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15509 Modified Files: showpathconflicts Log Message: components own paths, not packages Index: showpathconflicts =================================================================== RCS file: /mnt/specifix/cvs/conary/scripts/showpathconflicts,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- showpathconflicts 6 Aug 2004 20:50:30 -0000 1.2 +++ showpathconflicts 6 Aug 2004 20:51:47 -0000 1.3 @@ -14,8 +14,10 @@ # full details. # -""" Shows those paths on your local system that are owned by multiple - packages """ +""" +Shows those paths on your local system that are owned by multiple +components +""" import os import sys From johnsonm@specifixinc.com Fri Aug 6 17:34:43 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76LYhbI017080 for ; Fri, 6 Aug 2004 17:34:43 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3E4B116744 for ; Fri, 6 Aug 2004 14:35:11 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76LZ9TD016806; Fri, 6 Aug 2004 17:35:09 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76LZ9PZ016802; Fri, 6 Aug 2004 17:35:09 -0400 Date: Fri, 6 Aug 2004 17:35:09 -0400 From: johnsonm@specifixinc.com Message-Id: <200408062135.i76LZ9PZ016802@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/examples Precedence: first-class Cc: Subject: conary/examples tmpwatch.chameleon.recipe, 1.6, 1.7 tmpwatch.recipe, 1.27, 1.28 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 21:34:43 -0000 Update of /spx/cvs/conary/examples In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16790 Modified Files: tmpwatch.chameleon.recipe tmpwatch.recipe Log Message: update to track conary changes Index: tmpwatch.chameleon.recipe =================================================================== RCS file: /spx/cvs/conary/examples/tmpwatch.chameleon.recipe,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tmpwatch.chameleon.recipe 11 Jun 2004 17:49:43 -0000 1.6 +++ tmpwatch.chameleon.recipe 6 Aug 2004 21:35:07 -0000 1.7 @@ -3,7 +3,7 @@ # All rights reserved # -class tmpwatch(Recipe): +class tmpwatch(PackageRecipe): buildRequires = [ "glibc" ] name = "tmpwatch" @@ -24,4 +24,4 @@ r.Run('patch -p1 < tmpwatch.fakebug.patch') r.Make() r.MakeInstall(rootVar = "ROOT") - r.InstallFiles("crond-tmpwatch", "/etc/cron.daily/tmpwatch", mode=0755) + r.Install("crond-tmpwatch", "/etc/cron.daily/tmpwatch", mode=0755) Index: tmpwatch.recipe =================================================================== RCS file: /spx/cvs/conary/examples/tmpwatch.recipe,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tmpwatch.recipe 11 Jun 2004 17:49:43 -0000 1.27 +++ tmpwatch.recipe 6 Aug 2004 21:35:07 -0000 1.28 @@ -6,7 +6,6 @@ class tmpwatch(PackageRecipe): buildRequires = [ "glibc" ] - runRequires = [ "cron" ] name = "tmpwatch" version = "2.9.0" From ewt@specifixinc.com Fri Aug 6 17:35:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76LZFbI017088 for ; Fri, 6 Aug 2004 17:35:15 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 8475C16744 for ; Fri, 6 Aug 2004 14:35:43 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i76LZeTD016850; Fri, 6 Aug 2004 17:35:40 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i76LZeYl016844; Fri, 6 Aug 2004 17:35:40 -0400 Date: Fri, 6 Aug 2004 17:35:40 -0400 From: ewt@specifixinc.com Message-Id: <200408062135.i76LZeYl016844@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary changelog.py, 1.7, 1.8 checkin.py, 1.125, 1.126 streams.py, 1.5, 1.6 trove.py, 1.137, 1.138 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 21:35:16 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16765 Modified Files: changelog.py checkin.py streams.py trove.py Log Message: started work on moving Trove to be a StreamSet Index: changelog.py =================================================================== RCS file: /cvs/conary/changelog.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- changelog.py 30 Jul 2004 16:34:15 -0000 1.7 +++ changelog.py 6 Aug 2004 21:35:38 -0000 1.8 @@ -16,16 +16,40 @@ """ import os +import streams import string import tempfile -class ChangeLog: +class AbstractChangeLog(streams.TupleStream): - def freeze(self): - assert(self.message[-1] == '\n') - return "%s\n%s\n%s" % (self.name, self.contact, self.message) + __slots__ = [ 'items' ] + makeup = ( ("name", streams.StringStream, "!B"), + ("contact", streams.StringStream, "!B"), + ("message", streams.StringStream, "!H") ) + + def getName(self): + return self.items[0].value() + + def setName(self, value): + return self.items[0].set(value) + + def getContact(self): + return self.items[1].value() + + def setContact(self, value): + return self.items[1].set(value) def getMessage(self): + return self.items[2].value() + + def setMessage(self, value): + assert(value[-1] == '\n') + return self.items[2].set(value) + + def freeze(self): + return streams.TupleStream.freeze(self) + + def getMessageFromUser(self): editor = os.environ.get("EDITOR", "/bin/vi") (fd, name) = tempfile.mkstemp() msg = "\n-----\nEnter your change log message.\n" @@ -45,24 +69,30 @@ newMsg = string.strip(newMsg) newMsg += '\n' - self.message = newMsg + self.setMessage(newMsg) return True def __eq__(self, other): - return self.__class__ == other.__class__ and \ - self.name == other.name and \ - self.contact == other.contact and \ - self.message == other.message + if not isinstance(other, AbstractChangeLog): + return False + + return self.items == other.items + +class ChangeLog(AbstractChangeLog): + + __slots__ = [ 'items' ] def __init__(self, name, contact, message): assert(not message or message[-1] == '\n') - self.name = name - self.contact = contact - self.message = message - -def ThawChangeLog(frzLines): - name = frzLines[0] - contact = frzLines[1] - message = "\n".join(frzLines[2:]) + "\n" - return ChangeLog(name, contact, message) + AbstractChangeLog.__init__(self) + + self.setName(name) + self.setContact(contact) + self.setMessage(message) + +class ThawChangeLog(AbstractChangeLog): + + __slots__ = [ 'items' ] + + pass Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- checkin.py 5 Aug 2004 21:53:19 -0000 1.125 +++ checkin.py 6 Aug 2004 21:35:38 -0000 1.126 @@ -47,9 +47,9 @@ def write(self, filename): f = open(filename, "w") - f.write("name %s\n" % self.name) + f.write("name %s\n" % self.getName()) if self.version: - f.write("version %s\n" % self.version.freeze()) + f.write("version %s\n" % self.getVersion().freeze()) f.write(self.freezeFileList()) def changeBranch(self, branch): @@ -270,7 +270,7 @@ message += '\n' cl = changelog.ChangeLog(cfg.name, cfg.contact, message) - if message is None and not cl.getMessage(): + if message is None and not cl.getMessageFromUser(): log.error("no change log message was given") return Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- streams.py 6 Aug 2004 18:48:18 -0000 1.5 +++ streams.py 6 Aug 2004 21:35:38 -0000 1.6 @@ -17,6 +17,7 @@ import copy import struct +import versions from deps import filedeps, deps @@ -30,6 +31,8 @@ _STREAM_TAGS = 8 _STREAM_TARGET = 9 +_STREAM_TROVE = 0x00010000 + class InfoStream(object): __slots__ = () @@ -187,6 +190,54 @@ def __str__(self): return "%x%x%x%x%x" % struct.unpack("!5I", self.s) +class FrozenVersionStream(InfoStream): + + __slots__ = "v" + + def value(self): + return self.v + + def set(self, val): + assert(not val or min(val.timeStamps()) > 0) + self.v = val + + def merge(self, other): + if other.v != None: + self.v = other.v + + def freeze(self): + return self.v.freeze() + + def diff(self, them): + if self.v != them.v: + return self.v.freeze() + + return "" + + def thaw(self, frz): + if frz: + self.v = versions.ThawVersion(frz) + else: + self.v = None + + def twm(self, diff, base): + if not diff: return False + + if self.v == base.v: + self.v = diff + return False + elif self.v != diff: + return True + + return False + + def __eq__(self, other): + return other.__class__ == self.__class__ and \ + self.v == other.v + + def __init__(self, v = None): + self.thaw(v) + class DependenciesStream(InfoStream): """ Stores list of strings; used for requires/provides lists @@ -357,6 +408,7 @@ items = [] makeup = self.makeup idx = 0 + for (i, (name, itemType, size)) in enumerate(makeup): if type(size) == int: items.append(itemType(s[idx:idx + size])) @@ -367,6 +419,9 @@ if size == "B": size = struct.unpack("B", s[idx])[0] idx += 1 + elif size == "!B": + size = struct.unpack("!B", s[idx])[0] + idx += 1 elif size == "!H": size = struct.unpack("!H", s[idx:idx + 2])[0] idx += 2 Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- trove.py 6 Aug 2004 17:21:46 -0000 1.137 +++ trove.py 6 Aug 2004 21:35:38 -0000 1.138 @@ -18,10 +18,39 @@ import changelog import copy import files +import streams import versions from deps import deps +from streams import _STREAM_TROVE + +_STREAM_TRV_NAME = _STREAM_TROVE + 1 +_STREAM_TRV_DEPS = _STREAM_TROVE + 2 +_STREAM_TRV_VERSION = _STREAM_TROVE + 3 +_STREAM_TRV_CHANGELOG = _STREAM_TROVE + 4 + +class FullDepsStream(streams.TupleStream): + + __slots__ = [ 'items' ] + makeup = ( ("flavor", streams.DependenciesStream, "!H"), + ("requires", streams.DependenciesStream, "!H"), + ("provides", streams.DependenciesStream, "!H") ) + + def getFlavor(self): + return self.items[0].value() + + def setFlavor(self, value): + return self.items[0].set(value) + +class Trove(streams.StreamSet): + + streamDict = { + _STREAM_TRV_NAME : (streams.StringStream, "name" ), + _STREAM_TRV_VERSION : (streams.FrozenVersionStream, "version" ), + _STREAM_TRV_DEPS : (FullDepsStream, "deps" ), + #_STREAM_TRV_CHANGELOG : (changelog.ThawChangeLog, "changelog" ), + } + streamList = streams.streamSetDictToList(streamDict) -class Trove: """ Packages are groups of files and other packages, which are included by reference. By convention, "package" often refers to a package with @@ -29,20 +58,18 @@ packages but no files. While this object allows any mix of file and package inclusion, in practice conary doesn't allow it. """ - def copy(self): - return copy.deepcopy(self) def getName(self): - return self.name + return self.name.value() def getVersion(self): - return self.version + return self.version.value() def changeVersion(self, version): - self.version = version + self.version.set(version) def changeFlavor(self, flavor): - self.flavor = flavor + self.deps.setFlavor(flavor) def addFile(self, fileId, path, version): self.idMap[fileId] = (path, version) @@ -91,7 +118,7 @@ @type presentOkay: boolean """ if not presentOkay and self.packages.has_key((name, version, flavor)): - raise TroveError, "duplicate trove included in %s" % self.name + raise TroveError, "duplicate trove included in %s" % self.getName() self.packages[(name, version, flavor)] = True def delTrove(self, name, version, flavor, missingOkay): @@ -180,20 +207,20 @@ for (fileId, path, fileVersion) in pkgCS.getNewFileList(): self.addFile(fileId, path, fileVersion) - fileMap[fileId] = self.idMap[fileId] + (self.name, None, None) + fileMap[fileId] = self.idMap[fileId] + (self.name.value(), None, None) for (fileId, path, fileVersion) in pkgCS.getChangedFileList(): (oldPath, oldVersion) = self.idMap[fileId] self.updateFile(fileId, path, fileVersion) # look up the path/version in self.idMap as the ones here # could be None - fileMap[fileId] = self.idMap[fileId] + (self.name, oldPath, oldVersion) + fileMap[fileId] = self.idMap[fileId] + (self.name.value(), oldPath, oldVersion) for fileId in pkgCS.getOldFileList(): self.removeFile(fileId) self.mergeTroveListChanges(pkgCS.iterChangedTroves()) - self.flavor = pkgCS.getNewFlavor() + self.deps.setFlavor(pkgCS.getNewFlavor()) self.changeLog = pkgCS.getChangeLog() self.setProvides(pkgCS.getProvides()) self.setRequires(pkgCS.getRequires()) @@ -268,20 +295,20 @@ @rtype: (TroveChangeSet, fileChangeList, troveChangeList) """ - assert(not them or self.name == them.name) + assert(not them or self.getName() == them.getName()) # find all of the file ids which have been added, removed, and # stayed the same if them: themMap = them.idMap - chgSet = TroveChangeSet(self.name, self.changeLog, + chgSet = TroveChangeSet(self.name.value(), self.changeLog, them.getVersion(), self.getVersion(), them.getFlavor(), self.getFlavor(), absolute = False) else: themMap = {} - chgSet = TroveChangeSet(self.name, self.changeLog, + chgSet = TroveChangeSet(self.name.value(), self.changeLog, None, self.getVersion(), None, self.getFlavor(), absolute = absolute) @@ -532,19 +559,22 @@ return self.requires def getFlavor(self): - return self.flavor + return self.deps.getFlavor() def getChangeLog(self): return self.changeLog def __init__(self, name, version, flavor, changeLog): + streams.StreamSet.__init__(self) self.idMap = {} - self.name = name - self.version = version - self.flavor = flavor + self.name.set(name) + self.version.set(version) + self.deps.setFlavor(flavor) self.packages = {} self.provides = None self.requires = None + assert(not changeLog or + isinstance(changeLog, changelog.AbstractChangeLog)) self.changeLog = changeLog class TroveChangeSet: @@ -755,7 +785,7 @@ rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) if self.changeLog: - frz = self.changeLog.freeze() + frz = self.changeLog.freeze() + "\n" rc.append("CL %d\n" % frz.count("\n")) rc.append(frz) @@ -931,7 +961,9 @@ if l.startswith("CL "): cnt = int(l.split(' ', 1)[1]) first = i + 2 - changeLog = changelog.ThawChangeLog(lines[first:first + cnt]) + clLines = lines[first:first + cnt] + frozenCl = "\n".join(clLines) + changeLog = changelog.ThawChangeLog(frozenCl) del lines[i: first + cnt] break From ewt@specifixinc.com Sat Aug 7 22:17:17 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i782HGbI020167 for ; Sat, 7 Aug 2004 22:17:17 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 036A316744 for ; Sat, 7 Aug 2004 19:17:46 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i782HhTD016775; Sat, 7 Aug 2004 22:17:43 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i782HhqR016763; Sat, 7 Aug 2004 22:17:43 -0400 Date: Sat, 7 Aug 2004 22:17:43 -0400 From: ewt@specifixinc.com Message-Id: <200408080217.i782HhqR016763@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary changelog.py, 1.8, 1.9 checkin.py, 1.126, 1.127 streams.py, 1.6, 1.7 trove.py, 1.138, 1.139 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2004 02:17:17 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16750 Modified Files: changelog.py checkin.py streams.py trove.py Log Message: revert patch which started making Trove() into a StreamSet; it was misguided Index: changelog.py =================================================================== RCS file: /cvs/conary/changelog.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- changelog.py 6 Aug 2004 21:35:38 -0000 1.8 +++ changelog.py 8 Aug 2004 02:17:41 -0000 1.9 @@ -16,40 +16,16 @@ """ import os -import streams import string import tempfile -class AbstractChangeLog(streams.TupleStream): - - __slots__ = [ 'items' ] - makeup = ( ("name", streams.StringStream, "!B"), - ("contact", streams.StringStream, "!B"), - ("message", streams.StringStream, "!H") ) - - def getName(self): - return self.items[0].value() - - def setName(self, value): - return self.items[0].set(value) - - def getContact(self): - return self.items[1].value() - - def setContact(self, value): - return self.items[1].set(value) - - def getMessage(self): - return self.items[2].value() - - def setMessage(self, value): - assert(value[-1] == '\n') - return self.items[2].set(value) +class ChangeLog: def freeze(self): - return streams.TupleStream.freeze(self) + assert(self.message[-1] == '\n') + return "%s\n%s\n%s" % (self.name, self.contact, self.message) - def getMessageFromUser(self): + def getMessage(self): editor = os.environ.get("EDITOR", "/bin/vi") (fd, name) = tempfile.mkstemp() msg = "\n-----\nEnter your change log message.\n" @@ -69,30 +45,24 @@ newMsg = string.strip(newMsg) newMsg += '\n' - self.setMessage(newMsg) + self.message = newMsg return True def __eq__(self, other): - if not isinstance(other, AbstractChangeLog): - return False - - return self.items == other.items - -class ChangeLog(AbstractChangeLog): - - __slots__ = [ 'items' ] + return self.__class__ == other.__class__ and \ + self.name == other.name and \ + self.contact == other.contact and \ + self.message == other.message def __init__(self, name, contact, message): assert(not message or message[-1] == '\n') - AbstractChangeLog.__init__(self) - - self.setName(name) - self.setContact(contact) - self.setMessage(message) - -class ThawChangeLog(AbstractChangeLog): - - __slots__ = [ 'items' ] - - pass + self.name = name + self.contact = contact + self.message = message + +def ThawChangeLog(frzLines): + name = frzLines[0] + contact = frzLines[1] + message = "\n".join(frzLines[2:]) + "\n" + return ChangeLog(name, contact, message) Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- checkin.py 6 Aug 2004 21:35:38 -0000 1.126 +++ checkin.py 8 Aug 2004 02:17:41 -0000 1.127 @@ -47,9 +47,9 @@ def write(self, filename): f = open(filename, "w") - f.write("name %s\n" % self.getName()) + f.write("name %s\n" % self.name) if self.version: - f.write("version %s\n" % self.getVersion().freeze()) + f.write("version %s\n" % self.version.freeze()) f.write(self.freezeFileList()) def changeBranch(self, branch): @@ -270,7 +270,7 @@ message += '\n' cl = changelog.ChangeLog(cfg.name, cfg.contact, message) - if message is None and not cl.getMessageFromUser(): + if message is None and not cl.getMessage(): log.error("no change log message was given") return Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- streams.py 6 Aug 2004 21:35:38 -0000 1.6 +++ streams.py 8 Aug 2004 02:17:41 -0000 1.7 @@ -17,7 +17,6 @@ import copy import struct -import versions from deps import filedeps, deps @@ -31,8 +30,6 @@ _STREAM_TAGS = 8 _STREAM_TARGET = 9 -_STREAM_TROVE = 0x00010000 - class InfoStream(object): __slots__ = () @@ -190,54 +187,6 @@ def __str__(self): return "%x%x%x%x%x" % struct.unpack("!5I", self.s) -class FrozenVersionStream(InfoStream): - - __slots__ = "v" - - def value(self): - return self.v - - def set(self, val): - assert(not val or min(val.timeStamps()) > 0) - self.v = val - - def merge(self, other): - if other.v != None: - self.v = other.v - - def freeze(self): - return self.v.freeze() - - def diff(self, them): - if self.v != them.v: - return self.v.freeze() - - return "" - - def thaw(self, frz): - if frz: - self.v = versions.ThawVersion(frz) - else: - self.v = None - - def twm(self, diff, base): - if not diff: return False - - if self.v == base.v: - self.v = diff - return False - elif self.v != diff: - return True - - return False - - def __eq__(self, other): - return other.__class__ == self.__class__ and \ - self.v == other.v - - def __init__(self, v = None): - self.thaw(v) - class DependenciesStream(InfoStream): """ Stores list of strings; used for requires/provides lists @@ -408,7 +357,6 @@ items = [] makeup = self.makeup idx = 0 - for (i, (name, itemType, size)) in enumerate(makeup): if type(size) == int: items.append(itemType(s[idx:idx + size])) @@ -419,9 +367,6 @@ if size == "B": size = struct.unpack("B", s[idx])[0] idx += 1 - elif size == "!B": - size = struct.unpack("!B", s[idx])[0] - idx += 1 elif size == "!H": size = struct.unpack("!H", s[idx:idx + 2])[0] idx += 2 Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- trove.py 6 Aug 2004 21:35:38 -0000 1.138 +++ trove.py 8 Aug 2004 02:17:41 -0000 1.139 @@ -18,39 +18,10 @@ import changelog import copy import files -import streams import versions from deps import deps -from streams import _STREAM_TROVE - -_STREAM_TRV_NAME = _STREAM_TROVE + 1 -_STREAM_TRV_DEPS = _STREAM_TROVE + 2 -_STREAM_TRV_VERSION = _STREAM_TROVE + 3 -_STREAM_TRV_CHANGELOG = _STREAM_TROVE + 4 - -class FullDepsStream(streams.TupleStream): - - __slots__ = [ 'items' ] - makeup = ( ("flavor", streams.DependenciesStream, "!H"), - ("requires", streams.DependenciesStream, "!H"), - ("provides", streams.DependenciesStream, "!H") ) - - def getFlavor(self): - return self.items[0].value() - - def setFlavor(self, value): - return self.items[0].set(value) - -class Trove(streams.StreamSet): - - streamDict = { - _STREAM_TRV_NAME : (streams.StringStream, "name" ), - _STREAM_TRV_VERSION : (streams.FrozenVersionStream, "version" ), - _STREAM_TRV_DEPS : (FullDepsStream, "deps" ), - #_STREAM_TRV_CHANGELOG : (changelog.ThawChangeLog, "changelog" ), - } - streamList = streams.streamSetDictToList(streamDict) +class Trove: """ Packages are groups of files and other packages, which are included by reference. By convention, "package" often refers to a package with @@ -58,18 +29,20 @@ packages but no files. While this object allows any mix of file and package inclusion, in practice conary doesn't allow it. """ + def copy(self): + return copy.deepcopy(self) def getName(self): - return self.name.value() + return self.name def getVersion(self): - return self.version.value() + return self.version def changeVersion(self, version): - self.version.set(version) + self.version = version def changeFlavor(self, flavor): - self.deps.setFlavor(flavor) + self.flavor = flavor def addFile(self, fileId, path, version): self.idMap[fileId] = (path, version) @@ -118,7 +91,7 @@ @type presentOkay: boolean """ if not presentOkay and self.packages.has_key((name, version, flavor)): - raise TroveError, "duplicate trove included in %s" % self.getName() + raise TroveError, "duplicate trove included in %s" % self.name self.packages[(name, version, flavor)] = True def delTrove(self, name, version, flavor, missingOkay): @@ -207,20 +180,20 @@ for (fileId, path, fileVersion) in pkgCS.getNewFileList(): self.addFile(fileId, path, fileVersion) - fileMap[fileId] = self.idMap[fileId] + (self.name.value(), None, None) + fileMap[fileId] = self.idMap[fileId] + (self.name, None, None) for (fileId, path, fileVersion) in pkgCS.getChangedFileList(): (oldPath, oldVersion) = self.idMap[fileId] self.updateFile(fileId, path, fileVersion) # look up the path/version in self.idMap as the ones here # could be None - fileMap[fileId] = self.idMap[fileId] + (self.name.value(), oldPath, oldVersion) + fileMap[fileId] = self.idMap[fileId] + (self.name, oldPath, oldVersion) for fileId in pkgCS.getOldFileList(): self.removeFile(fileId) self.mergeTroveListChanges(pkgCS.iterChangedTroves()) - self.deps.setFlavor(pkgCS.getNewFlavor()) + self.flavor = pkgCS.getNewFlavor() self.changeLog = pkgCS.getChangeLog() self.setProvides(pkgCS.getProvides()) self.setRequires(pkgCS.getRequires()) @@ -295,20 +268,20 @@ @rtype: (TroveChangeSet, fileChangeList, troveChangeList) """ - assert(not them or self.getName() == them.getName()) + assert(not them or self.name == them.name) # find all of the file ids which have been added, removed, and # stayed the same if them: themMap = them.idMap - chgSet = TroveChangeSet(self.name.value(), self.changeLog, + chgSet = TroveChangeSet(self.name, self.changeLog, them.getVersion(), self.getVersion(), them.getFlavor(), self.getFlavor(), absolute = False) else: themMap = {} - chgSet = TroveChangeSet(self.name.value(), self.changeLog, + chgSet = TroveChangeSet(self.name, self.changeLog, None, self.getVersion(), None, self.getFlavor(), absolute = absolute) @@ -559,22 +532,19 @@ return self.requires def getFlavor(self): - return self.deps.getFlavor() + return self.flavor def getChangeLog(self): return self.changeLog def __init__(self, name, version, flavor, changeLog): - streams.StreamSet.__init__(self) self.idMap = {} - self.name.set(name) - self.version.set(version) - self.deps.setFlavor(flavor) + self.name = name + self.version = version + self.flavor = flavor self.packages = {} self.provides = None self.requires = None - assert(not changeLog or - isinstance(changeLog, changelog.AbstractChangeLog)) self.changeLog = changeLog class TroveChangeSet: @@ -785,7 +755,7 @@ rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) if self.changeLog: - frz = self.changeLog.freeze() + "\n" + frz = self.changeLog.freeze() rc.append("CL %d\n" % frz.count("\n")) rc.append(frz) @@ -961,9 +931,7 @@ if l.startswith("CL "): cnt = int(l.split(' ', 1)[1]) first = i + 2 - clLines = lines[first:first + cnt] - frozenCl = "\n".join(clLines) - changeLog = changelog.ThawChangeLog(frozenCl) + changeLog = changelog.ThawChangeLog(lines[first:first + cnt]) del lines[i: first + cnt] break From ewt@specifixinc.com Sat Aug 7 22:22:47 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i782MkbI020177 for ; Sat, 7 Aug 2004 22:22:47 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 4D57B16744 for ; Sat, 7 Aug 2004 19:23:16 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i782NBTD017059; Sat, 7 Aug 2004 22:23:11 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i782NBnH017056; Sat, 7 Aug 2004 22:23:11 -0400 Date: Sat, 7 Aug 2004 22:23:11 -0400 From: ewt@specifixinc.com Message-Id: <200408080223.i782NBnH017056@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.7,1.8 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2004 02:22:47 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv17043 Modified Files: streams.py Log Message: added FrozenVersionStream Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- streams.py 8 Aug 2004 02:17:41 -0000 1.7 +++ streams.py 8 Aug 2004 02:23:09 -0000 1.8 @@ -17,6 +17,7 @@ import copy import struct +import versions from deps import filedeps, deps @@ -30,6 +31,8 @@ _STREAM_TAGS = 8 _STREAM_TARGET = 9 +_STREAM_TROVE_CHANGESET = 0x00010000 + class InfoStream(object): __slots__ = () @@ -187,6 +190,54 @@ def __str__(self): return "%x%x%x%x%x" % struct.unpack("!5I", self.s) +class FrozenVersionStream(InfoStream): + + __slots__ = "v" + + def value(self): + return self.v + + def set(self, val): + assert(not val or min(val.timeStamps()) > 0) + self.v = val + + def merge(self, other): + if other.v != None: + self.v = other.v + + def freeze(self): + return self.v.freeze() + + def diff(self, them): + if self.v != them.v: + return self.v.freeze() + + return "" + + def thaw(self, frz): + if frz: + self.v = versions.ThawVersion(frz) + else: + self.v = None + + def twm(self, diff, base): + if not diff: return False + + if self.v == base.v: + self.v = diff + return False + elif self.v != diff: + return True + + return False + + def __eq__(self, other): + return other.__class__ == self.__class__ and \ + self.v == other.v + + def __init__(self, v = None): + self.thaw(v) + class DependenciesStream(InfoStream): """ Stores list of strings; used for requires/provides lists @@ -357,6 +408,7 @@ items = [] makeup = self.makeup idx = 0 + for (i, (name, itemType, size)) in enumerate(makeup): if type(size) == int: items.append(itemType(s[idx:idx + size])) From ewt@specifixinc.com Sat Aug 7 23:01:22 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7831LbI020216 for ; Sat, 7 Aug 2004 23:01:22 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 5EC9916744 for ; Sat, 7 Aug 2004 20:01:51 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7831nTD017948; Sat, 7 Aug 2004 23:01:49 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7831nbW017944; Sat, 7 Aug 2004 23:01:49 -0400 Date: Sat, 7 Aug 2004 23:01:49 -0400 From: ewt@specifixinc.com Message-Id: <200408080301.i7831nbW017944@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary changelog.py,1.9,1.10 checkin.py,1.127,1.128 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2004 03:01:22 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv17925 Modified Files: changelog.py checkin.py Log Message: converted ChangeLog to a TupleStream Index: changelog.py =================================================================== RCS file: /cvs/conary/changelog.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- changelog.py 8 Aug 2004 02:17:41 -0000 1.9 +++ changelog.py 8 Aug 2004 03:01:47 -0000 1.10 @@ -16,16 +16,40 @@ """ import os +import streams import string import tempfile -class ChangeLog: +class AbstractChangeLog(streams.TupleStream): - def freeze(self): - assert(self.message[-1] == '\n') - return "%s\n%s\n%s" % (self.name, self.contact, self.message) + __slots__ = [ 'items' ] + makeup = ( ("name", streams.StringStream, "!B"), + ("contact", streams.StringStream, "!B"), + ("message", streams.StringStream, "!H") ) + + def getName(self): + return self.items[0].value() + + def setName(self, value): + return self.items[0].set(value) + + def getContact(self): + return self.items[1].value() + + def setContact(self, value): + return self.items[1].set(value) def getMessage(self): + return self.items[2].value() + + def setMessage(self, value): + assert(value[-1] == '\n') + return self.items[2].set(value) + + def freeze(self): + return streams.TupleStream.freeze(self) + + def getMessageFromUser(self): editor = os.environ.get("EDITOR", "/bin/vi") (fd, name) = tempfile.mkstemp() msg = "\n-----\nEnter your change log message.\n" @@ -45,24 +69,30 @@ newMsg = string.strip(newMsg) newMsg += '\n' - self.message = newMsg + self.setMessage(newMsg) return True def __eq__(self, other): - return self.__class__ == other.__class__ and \ - self.name == other.name and \ - self.contact == other.contact and \ - self.message == other.message + if not isinstance(other, AbstractChangeLog): + return False + + return self.items == other.items + +class ChangeLog(AbstractChangeLog): + + __slots__ = [ 'items' ] def __init__(self, name, contact, message): assert(not message or message[-1] == '\n') - self.name = name - self.contact = contact - self.message = message - -def ThawChangeLog(frzLines): - name = frzLines[0] - contact = frzLines[1] - message = "\n".join(frzLines[2:]) + "\n" - return ChangeLog(name, contact, message) + AbstractChangeLog.__init__(self) + + self.setName(name) + self.setContact(contact) + self.setMessage(message) + +class ThawChangeLog(AbstractChangeLog): + + __slots__ = [ 'items' ] + + pass Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- checkin.py 8 Aug 2004 02:17:41 -0000 1.127 +++ checkin.py 8 Aug 2004 03:01:47 -0000 1.128 @@ -47,9 +47,9 @@ def write(self, filename): f = open(filename, "w") - f.write("name %s\n" % self.name) + f.write("name %s\n" % self.getName()) if self.version: - f.write("version %s\n" % self.version.freeze()) + f.write("version %s\n" % self.getVersion().freeze()) f.write(self.freezeFileList()) def changeBranch(self, branch): @@ -270,7 +270,7 @@ message += '\n' cl = changelog.ChangeLog(cfg.name, cfg.contact, message) - if message is None and not cl.getMessage(): + if message is None and not cl.getMessageFromUser(): log.error("no change log message was given") return From ewt@specifixinc.com Sat Aug 7 23:14:11 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i783EAbI020226 for ; Sat, 7 Aug 2004 23:14:11 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 1CC3816744 for ; Sat, 7 Aug 2004 20:14:40 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i783EZTD018262; Sat, 7 Aug 2004 23:14:35 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i783EZsK018255; Sat, 7 Aug 2004 23:14:35 -0400 Date: Sat, 7 Aug 2004 23:14:35 -0400 From: ewt@specifixinc.com Message-Id: <200408080314.i783EZsK018255@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary changelog.py, 1.10, 1.11 checkin.py, 1.128, 1.129 files.py, 1.158, 1.159 streams.py, 1.8, 1.9 trove.py, 1.139, 1.140 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2004 03:14:11 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18237 Modified Files: changelog.py checkin.py files.py streams.py trove.py Log Message: began moving TroveChangeSet to an infostream; smaller, more extensible, better Index: changelog.py =================================================================== RCS file: /cvs/conary/changelog.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- changelog.py 8 Aug 2004 03:01:47 -0000 1.10 +++ changelog.py 8 Aug 2004 03:14:33 -0000 1.11 @@ -23,8 +23,8 @@ class AbstractChangeLog(streams.TupleStream): __slots__ = [ 'items' ] - makeup = ( ("name", streams.StringStream, "!B"), - ("contact", streams.StringStream, "!B"), + makeup = ( ("name", streams.StringStream, "B"), + ("contact", streams.StringStream, "B"), ("message", streams.StringStream, "!H") ) def getName(self): @@ -47,7 +47,11 @@ return self.items[2].set(value) def freeze(self): - return streams.TupleStream.freeze(self) + if self.items[0].value() or self.items[1].value() or \ + self.items[2].value(): + return streams.TupleStream.freeze(self) + else: + return "" def getMessageFromUser(self): editor = os.environ.get("EDITOR", "/bin/vi") @@ -78,6 +82,10 @@ return self.items == other.items + def __init__(self, data = None): + if data == "": data = None + streams.TupleStream.__init__(self, data) + class ChangeLog(AbstractChangeLog): __slots__ = [ 'items' ] Index: checkin.py =================================================================== RCS file: /cvs/conary/checkin.py,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- checkin.py 8 Aug 2004 03:01:47 -0000 1.128 +++ checkin.py 8 Aug 2004 03:14:33 -0000 1.129 @@ -608,10 +608,10 @@ else: versionStr = version.trailingVersion().asString() - if changeLog: + if changeLog.getName(): print "%s %s (%s) %s" % \ - (versionStr, changeLog.name, changeLog.contact, when) - lines = changeLog.message.split("\n") + (versionStr, changeLog.getName(), changeLog.getContact(), when) + lines = changeLog.getMessage().split("\n") for l in lines: print " %s" % l else: Index: files.py =================================================================== RCS file: /cvs/conary/files.py,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- files.py 6 Aug 2004 18:43:02 -0000 1.158 +++ files.py 8 Aug 2004 03:14:33 -0000 1.159 @@ -224,7 +224,6 @@ streamDict = { streams._STREAM_INODE : (InodeStream, "inode"), streams._STREAM_FLAGS : (FlagsStream, "flags"), streams._STREAM_TAGS : (streams.StringsStream, "tags") } - streamList = streams.streamSetDictToList(streamDict) __slots__ = [ "theId", "inode", "flags", "tags" ] def modeString(self): @@ -313,7 +312,6 @@ lsTag = "l" streamDict = { streams._STREAM_TARGET : (streams.StringStream, "target") } streamDict.update(File.streamDict) - streamList = streams.streamSetDictToList(streamDict) __slots__ = "target" def sizeString(self): @@ -378,7 +376,6 @@ streamDict = { streams._STREAM_DEVICE : (DeviceStream, "devt") } streamDict.update(File.streamDict) - streamList = streams.streamSetDictToList(streamDict) __slots__ = [ 'devt' ] def sizeString(self): @@ -419,7 +416,6 @@ streams._STREAM_FLAVOR : (streams.DependenciesStream, 'flavor' ) } streamDict.update(File.streamDict) - streamList = streams.streamSetDictToList(streamDict) __slots__ = ('contents', 'provides', 'requires', 'flavor') lsTag = "-" Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- streams.py 8 Aug 2004 02:23:09 -0000 1.8 +++ streams.py 8 Aug 2004 03:14:33 -0000 1.9 @@ -31,7 +31,7 @@ _STREAM_TAGS = 8 _STREAM_TARGET = 9 -_STREAM_TROVE_CHANGESET = 0x00010000 +_STREAM_TROVE_CHANGE_SET = 100 class InfoStream(object): @@ -206,7 +206,10 @@ self.v = other.v def freeze(self): - return self.v.freeze() + if self.v: + return self.v.freeze() + else: + return "" def diff(self, them): if self.v != them.v: @@ -446,15 +449,6 @@ items.append(itemType(all[i])) self.items = items -def streamSetDictToList(d): - vals = d.keys() - m = max(vals) - l = range(m + 1) - for v in vals: - l[v] = d[v] - - return l - class StreamSet(InfoStream): def __init__(self, data = None): @@ -467,7 +461,7 @@ while i < dataLen: assert(i < dataLen) (streamId, size) = struct.unpack("!BH", data[i:i+3]) - (streamType, name) = self.streamList[streamId] + (streamType, name) = self.streamDict[streamId] i += 3 self.__setattr__(name, streamType(data[i:i + size])) i += size Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- trove.py 8 Aug 2004 02:17:41 -0000 1.139 +++ trove.py 8 Aug 2004 03:14:33 -0000 1.140 @@ -18,6 +18,8 @@ import changelog import copy import files +import streams +import struct import versions from deps import deps @@ -547,7 +549,23 @@ self.requires = None self.changeLog = changeLog -class TroveChangeSet: +_STREAM_TCS_NAME = streams._STREAM_TROVE_CHANGE_SET + 0 +_STREAM_TCS_OLD_VERSION = streams._STREAM_TROVE_CHANGE_SET + 1 +_STREAM_TCS_NEW_VERSION = streams._STREAM_TROVE_CHANGE_SET + 2 +_STREAM_TCS_REQUIRES = streams._STREAM_TROVE_CHANGE_SET + 3 +_STREAM_TCS_PROVIDES = streams._STREAM_TROVE_CHANGE_SET + 4 +_STREAM_TCS_CHANGE_LOG = streams._STREAM_TROVE_CHANGE_SET + 5 + +class AbstractTroveChangeSet(streams.StreamSet): + + streamDict = { + _STREAM_TCS_NAME : (streams.StringStream, "name"), + _STREAM_TCS_OLD_VERSION : (streams.FrozenVersionStream, "oldVersion" ), + _STREAM_TCS_NEW_VERSION : (streams.FrozenVersionStream, "newVersion" ), + _STREAM_TCS_REQUIRES : (streams.DependenciesStream, "requires" ), + _STREAM_TCS_PROVIDES : (streams.DependenciesStream, "provides" ), + _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog, "changeLog" ), + } """ Represents the changes between two packages and forms part of a @@ -570,25 +588,25 @@ return self.oldFiles def getName(self): - return self.name + return self.name.value() def getChangeLog(self): return self.changeLog def changeOldVersion(self, version): - self.oldVersion = version + self.oldVersion.set(version) def changeNewVersion(self, version): - self.newVersion = version + self.newVersion.set(version) def changeChangeLog(self, cl): self.changeLog = cl def getOldVersion(self): - return self.oldVersion + return self.oldVersion.value() def getNewVersion(self): - return self.newVersion + return self.newVersion.value() # path and/or version can be None def changedFile(self, fileId, path, version): @@ -658,21 +676,21 @@ if self.isAbsolute(): f.write("absolute ") - elif self.oldVersion: - f.write("from %s to " % self.oldVersion.asString()) + elif self.getOldVersion(): + f.write("from %s to " % self.getOldVersion.asString()) else: f.write("new ") - f.write("%s\n" % self.newVersion.asString()) + f.write("%s\n" % self.getNewVersion().asString()) def depformat(name, dep, f): f.write('\t%s: %s\n' %(name, str(dep).replace('\n', '\n\t%s' %(' '* (len(name)+2))))) - if self.requires: - depformat('Requires', self.requires, f) - if self.provides: - depformat('Provides', self.provides, f) + if self.getRequires(): + depformat('Requires', self.getRequires(), f) + if self.getProvides(): + depformat('Provides', self.getProvides(), f) if self.oldFlavor: depformat('Old Flavor', self.oldFlavor, f) if self.newFlavor: @@ -735,16 +753,13 @@ lines = 0 if self.absolute: - rc.append("ABS %s %s\n" % (self.name, self.newVersion.freeze())) - elif not self.oldVersion: - rc.append("NEW %s %s\n" % (self.name, self.newVersion.freeze())) + rc.append("ABS\n") + elif not self.getOldVersion(): + rc.append("NEW\n") else: - rc.append("CS %s %s %s\n" % (self.name, self.oldVersion.freeze(), - self.newVersion.freeze())) - if self.requires: - rc.append("REQUIRES %s\n" % (self.requires.freeze())) - if self.provides: - rc.append("PROVIDES %s\n" % (self.provides.freeze())) + rc.append("CS\n") + if self.getProvides(): + rc.append("PROVIDES %s\n" % (self.getProvides().freeze())) if self.oldFlavor and self.newFlavor: rc.append("FLAVOR %s %s\n" % (self.oldFlavor.freeze(), @@ -754,11 +769,6 @@ elif not self.oldFlavor and self.newFlavor: rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) - if self.changeLog: - frz = self.changeLog.freeze() - rc.append("CL %d\n" % frz.count("\n")) - rc.append(frz) - for id in self.getOldFileList(): rc.append("-%s\n" % id) @@ -793,19 +803,25 @@ if lines: rc.append("\n".join(lines) + "\n") - return "".join(rc) + newStyle = "" + rc = "".join(rc) + + final = struct.pack("!H", len(rc)) + rc + \ + streams.StreamSet.freeze(self) + + return final def setProvides(self, provides): - self.provides = provides + self.provides.set(provides) def getProvides(self): - return self.provides + return self.provides.value() def setRequires(self, requires): - self.requires = requires + self.requires.set(requires) def getRequires(self): - return self.requires + return self.requires.value() def getOldFlavor(self): return self.oldFlavor @@ -813,37 +829,35 @@ def getNewFlavor(self): return self.newFlavor + def __init__(self, data = None): + streams.StreamSet.__init__(self, data) + +class TroveChangeSet(AbstractTroveChangeSet): + def __init__(self, name, changeLog, oldVersion, newVersion, oldFlavor, newFlavor, absolute = 0): + AbstractTroveChangeSet.__init__(self) assert(isinstance(newVersion, versions.AbstractVersion)) assert(not newFlavor or isinstance(newFlavor, deps.DependencySet)) assert(not oldFlavor or isinstance(oldFlavor, deps.DependencySet)) - self.name = name - self.oldVersion = oldVersion - self.newVersion = newVersion - self.changeLog = changeLog + self.name.set(name) + self.oldVersion.set(oldVersion) + self.newVersion.set(newVersion) + if changeLog: + self.changeLog = changeLog self.newFiles = [] self.oldFiles = [] self.changedFiles = [] self.absolute = absolute self.packages = {} - self.provides = None - self.requires = None + self.provides.set(None) + self.requires.set(None) self.oldFlavor = oldFlavor self.newFlavor = newFlavor -class ThawTroveChangeSet(TroveChangeSet): +class ThawTroveChangeSet(AbstractTroveChangeSet): def parse(self, line): - if line.startswith('REQUIRES '): - dep = line.split(' ', 1)[1] - self.setRequires(deps.ThawDependencySet(dep)) - return - if line.startswith('PROVIDES '): - dep = line.split(' ', 1)[1] - self.setProvides(deps.ThawDependencySet(dep)) - return - action = line[0] if action == "+" or action == "~": @@ -889,24 +903,20 @@ self.changedFiles.sort() def __init__(self, buf): + oldSize = struct.unpack("!H", buf[0:2])[0] + newStyle = buf[oldSize + 2:] + buf = buf[2:oldSize + 2] + + AbstractTroveChangeSet.__init__(self, newStyle) + lines = buf.split("\n")[:-1] header = lines[0] l = header.split() pkgType = l[0] - pkgName = l[1] - - if pkgType == "CS": - oldVersion = versions.ThawVersion(l[2]) - rest = 3 - elif pkgType == "NEW" or pkgType == "ABS": - oldVersion = None - rest = 2 - else: - raise IOError, "invalid line in change set %s" % file - newVersion = versions.ThawVersion(l[rest]) + oldVersion = None # find the flavor oldFlavor = None @@ -935,9 +945,13 @@ del lines[i: first + cnt] break - TroveChangeSet.__init__(self, pkgName, changeLog, oldVersion, - newVersion, oldFlavor, newFlavor, - absolute = (pkgType == "ABS")) + self.newFiles = [] + self.oldFiles = [] + self.changedFiles = [] + self.absolute = (pkgType == "ABS") + self.packages = {} + self.oldFlavor = oldFlavor + self.newFlavor = newFlavor for line in lines: self.parse(line) From ewt@specifixinc.com Sun Aug 8 11:21:08 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i78FL8bI024143 for ; Sun, 8 Aug 2004 11:21:08 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 062BA16212 for ; Sun, 8 Aug 2004 08:21:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i78FLaTD001486; Sun, 8 Aug 2004 11:21:36 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i78FLaFF001483; Sun, 8 Aug 2004 11:21:36 -0400 Date: Sun, 8 Aug 2004 11:21:36 -0400 From: ewt@specifixinc.com Message-Id: <200408081521.i78FLaFF001483@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.9,1.10 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2004 15:21:08 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv1465 Modified Files: streams.py Log Message: erased merge methods; they were unused anyway Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- streams.py 8 Aug 2004 03:14:33 -0000 1.9 +++ streams.py 8 Aug 2004 15:21:34 -0000 1.10 @@ -70,10 +70,6 @@ def set(self, val): self.val = val - def merge(self, other): - if other.val != None: - self.val = other.val - def freeze(self): return struct.pack(self.format, self.val) @@ -149,10 +145,6 @@ assert(type(val) is str) self.s = val - def merge(self, other): - if other.s != None: - self.s = other.s - def freeze(self): return self.s @@ -201,10 +193,6 @@ assert(not val or min(val.timeStamps()) > 0) self.v = val - def merge(self, other): - if other.v != None: - self.v = other.v - def freeze(self): if self.v: return self.v.freeze() @@ -254,9 +242,6 @@ def set(self, val): self.deps = val - def merge(self, other): - self.deps = other.deps - def freeze(self): if self.deps is None: return '' @@ -308,9 +293,6 @@ if val in self.l: self.l.remove(val) - def merge(self, other): - self.l = other.l - def __iter__(self): return self.l.__iter__() @@ -362,10 +344,6 @@ return "".join(rc) - def merge(self, other): - for i in xrange(len(self.makeup)): - self.items[i].merge(other.items[i]) - def diff(self, them): code = 0 rc = [] From ewt@specifixinc.com Sun Aug 8 11:27:42 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i78FRfbI024154 for ; Sun, 8 Aug 2004 11:27:42 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 0E8CF16212 for ; Sun, 8 Aug 2004 08:28:12 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i78FSATD001700; Sun, 8 Aug 2004 11:28:10 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i78FSAcZ001697; Sun, 8 Aug 2004 11:28:10 -0400 Date: Sun, 8 Aug 2004 11:28:10 -0400 From: ewt@specifixinc.com Message-Id: <200408081528.i78FSAcZ001697@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.10,1.11 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2004 15:27:42 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv1677 Modified Files: streams.py Log Message: switch StringsStream to descend from list rather encapsulating it Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- streams.py 8 Aug 2004 15:21:34 -0000 1.10 +++ streams.py 8 Aug 2004 15:28:08 -0000 1.11 @@ -270,47 +270,32 @@ self.deps = None self.thaw(dep) -class StringsStream(InfoStream): +class StringsStream(list, InfoStream): """ Stores list of arbitrary strings """ - __slots__ = 'l' - - def value(self): - return self.l - def set(self, val): - assert(type(val) is str) - if val not in self.l: - self.l.append(val) - self.l.sort() - - def __contains__(self, val): - return val in self.l - - def __delitem__(self, val): - if val in self.l: - self.l.remove(val) - - def __iter__(self): - return self.l.__iter__() + assert(type(val) is str) + if val not in self: + self.append(val) + self.sort() def freeze(self): - if self.l is None: + if not self: return '' - return '\0'.join(self.l) + return '\0'.join(self) def diff(self, them): - if self.l != them.l: + if self != them: return self.freeze() return '' def thaw(self, frz): - if len(frz) == 0: - self.l = [] - else: - self.l = frz.split('\0') + del self[:] + + if len(frz) != 0: + self += frz.split('\0') def twm(self, diff, base): if not diff: @@ -318,9 +303,6 @@ self.thaw(diff) return False - def __eq__(self, other): - return other.__class__ == self.__class__ and self.l == other.l - def __init__(self, frz = ''): self.thaw(frz) From ewt@specifixinc.com Sun Aug 8 13:11:28 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i78HBSbI024254 for ; Sun, 8 Aug 2004 13:11:28 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 418D6162A1 for ; Sun, 8 Aug 2004 10:11:58 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i78HBrTD003365; Sun, 8 Aug 2004 13:11:53 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i78HBrSK003361; Sun, 8 Aug 2004 13:11:53 -0400 Date: Sun, 8 Aug 2004 13:11:53 -0400 From: ewt@specifixinc.com Message-Id: <200408081711.i78HBrSK003361@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.11,1.12 trove.py,1.140,1.141 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2004 17:11:28 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv3349 Modified Files: streams.py trove.py Log Message: switch oldFiles to a stream Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- streams.py 8 Aug 2004 15:28:08 -0000 1.11 +++ streams.py 8 Aug 2004 17:11:51 -0000 1.12 @@ -295,8 +295,9 @@ del self[:] if len(frz) != 0: - self += frz.split('\0') - + for s in frz.split('\0'): + self.set(s) + def twm(self, diff, base): if not diff: return False Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- trove.py 8 Aug 2004 03:14:33 -0000 1.140 +++ trove.py 8 Aug 2004 17:11:51 -0000 1.141 @@ -555,6 +555,7 @@ _STREAM_TCS_REQUIRES = streams._STREAM_TROVE_CHANGE_SET + 3 _STREAM_TCS_PROVIDES = streams._STREAM_TROVE_CHANGE_SET + 4 _STREAM_TCS_CHANGE_LOG = streams._STREAM_TROVE_CHANGE_SET + 5 +_STREAM_TCS_OLD_FILES = streams._STREAM_TROVE_CHANGE_SET + 6 class AbstractTroveChangeSet(streams.StreamSet): @@ -565,6 +566,7 @@ _STREAM_TCS_REQUIRES : (streams.DependenciesStream, "requires" ), _STREAM_TCS_PROVIDES : (streams.DependenciesStream, "provides" ), _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog, "changeLog" ), + _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), } """ @@ -758,8 +760,6 @@ rc.append("NEW\n") else: rc.append("CS\n") - if self.getProvides(): - rc.append("PROVIDES %s\n" % (self.getProvides().freeze())) if self.oldFlavor and self.newFlavor: rc.append("FLAVOR %s %s\n" % (self.oldFlavor.freeze(), @@ -769,9 +769,6 @@ elif not self.oldFlavor and self.newFlavor: rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) - for id in self.getOldFileList(): - rc.append("-%s\n" % id) - for (id, path, version) in self.getNewFileList(): rc.append("+%s %s %s\n" % (id, path, version.asString())) @@ -846,7 +843,6 @@ if changeLog: self.changeLog = changeLog self.newFiles = [] - self.oldFiles = [] self.changedFiles = [] self.absolute = absolute self.packages = {} @@ -946,7 +942,6 @@ break self.newFiles = [] - self.oldFiles = [] self.changedFiles = [] self.absolute = (pkgType == "ABS") self.packages = {} From ewt@specifixinc.com Sun Aug 8 21:19:06 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i791J5bI024625 for ; Sun, 8 Aug 2004 21:19:06 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 492781654A for ; Sun, 8 Aug 2004 18:19:36 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i791JYTD011868; Sun, 8 Aug 2004 21:19:34 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i791JYp4011865; Sun, 8 Aug 2004 21:19:34 -0400 Date: Sun, 8 Aug 2004 21:19:34 -0400 From: ewt@specifixinc.com Message-Id: <200408090119.i791JYp4011865@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.141,1.142 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 01:19:06 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv11847 Modified Files: trove.py Log Message: added TCS_TYPE for absolute/relative distinction Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- trove.py 8 Aug 2004 17:11:51 -0000 1.141 +++ trove.py 9 Aug 2004 01:19:32 -0000 1.142 @@ -556,6 +556,10 @@ _STREAM_TCS_PROVIDES = streams._STREAM_TROVE_CHANGE_SET + 4 _STREAM_TCS_CHANGE_LOG = streams._STREAM_TROVE_CHANGE_SET + 5 _STREAM_TCS_OLD_FILES = streams._STREAM_TROVE_CHANGE_SET + 6 +_STREAM_TCS_TYPE = streams._STREAM_TROVE_CHANGE_SET + 7 + +_TCS_TYPE_ABSOLUTE = 1 +_TCS_TYPE_RELATIVE = 2 class AbstractTroveChangeSet(streams.StreamSet): @@ -567,6 +571,7 @@ _STREAM_TCS_PROVIDES : (streams.DependenciesStream, "provides" ), _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog, "changeLog" ), _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), + _STREAM_TCS_TYPE : (streams.IntStream, "tcsType" ), } """ @@ -575,7 +580,7 @@ """ def isAbsolute(self): - return self.absolute + return self.tcsType.value() == _TCS_TYPE_ABSOLUTE def newFile(self, fileId, path, version): self.newFiles.append((fileId, path, version)) @@ -674,7 +679,8 @@ self.packages[name].append(('-', version, flavor)) def formatToFile(self, changeSet, f): - f.write("%s " % self.name) + f.write("%s " % self.getName()) + f.write("KIND %d\n" % self.tcsType.value()) if self.isAbsolute(): f.write("absolute ") @@ -754,13 +760,6 @@ rc = [] lines = 0 - if self.absolute: - rc.append("ABS\n") - elif not self.getOldVersion(): - rc.append("NEW\n") - else: - rc.append("CS\n") - if self.oldFlavor and self.newFlavor: rc.append("FLAVOR %s %s\n" % (self.oldFlavor.freeze(), self.newFlavor.freeze())) @@ -844,7 +843,10 @@ self.changeLog = changeLog self.newFiles = [] self.changedFiles = [] - self.absolute = absolute + if absolute: + self.tcsType.set(_TCS_TYPE_ABSOLUTE) + else: + self.tcsType.set(_TCS_TYPE_RELATIVE) self.packages = {} self.provides.set(None) self.requires.set(None) @@ -917,7 +919,7 @@ # find the flavor oldFlavor = None newFlavor = None - for i, l in enumerate(lines[1:4]): + for i, l in enumerate(lines): if l.startswith("FLAVOR "): lst = l.split(' ', 2) oldFlavorStr, newFlavorStr = lst[1:3] @@ -928,22 +930,11 @@ if newFlavorStr != "-": newFlavor = deps.ThawDependencySet(newFlavorStr) - del lines[i + 1] + del lines[i] break - # find the change log - changeLog = None - for i, l in enumerate(lines[1:5]): - if l.startswith("CL "): - cnt = int(l.split(' ', 1)[1]) - first = i + 2 - changeLog = changelog.ThawChangeLog(lines[first:first + cnt]) - del lines[i: first + cnt] - break - self.newFiles = [] self.changedFiles = [] - self.absolute = (pkgType == "ABS") self.packages = {} self.oldFlavor = oldFlavor self.newFlavor = newFlavor From ewt@specifixinc.com Sun Aug 8 21:30:08 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i791U7bI024639 for ; Sun, 8 Aug 2004 21:30:07 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 478C91654A for ; Sun, 8 Aug 2004 18:30:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i791UaTD012129; Sun, 8 Aug 2004 21:30:36 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i791UaR2012126; Sun, 8 Aug 2004 21:30:36 -0400 Date: Sun, 8 Aug 2004 21:30:36 -0400 From: ewt@specifixinc.com Message-Id: <200408090130.i791UaR2012126@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.142,1.143 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 01:30:08 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv12108 Modified Files: trove.py Log Message: fixes for new trove change set parsing Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- trove.py 9 Aug 2004 01:19:32 -0000 1.142 +++ trove.py 9 Aug 2004 01:30:34 -0000 1.143 @@ -908,11 +908,6 @@ AbstractTroveChangeSet.__init__(self, newStyle) lines = buf.split("\n")[:-1] - header = lines[0] - - l = header.split() - - pkgType = l[0] oldVersion = None From ewt@specifixinc.com Sun Aug 8 21:57:25 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i791vObI024705 for ; Sun, 8 Aug 2004 21:57:25 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 862DF1654A for ; Sun, 8 Aug 2004 18:57:55 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i791vrTD012871; Sun, 8 Aug 2004 21:57:53 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i791vrps012868; Sun, 8 Aug 2004 21:57:53 -0400 Date: Sun, 8 Aug 2004 21:57:53 -0400 From: ewt@specifixinc.com Message-Id: <200408090157.i791vrps012868@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.143,1.144 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 01:57:25 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv12850 Modified Files: trove.py Log Message: extra print Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- trove.py 9 Aug 2004 01:30:34 -0000 1.143 +++ trove.py 9 Aug 2004 01:57:51 -0000 1.144 @@ -680,7 +680,6 @@ def formatToFile(self, changeSet, f): f.write("%s " % self.getName()) - f.write("KIND %d\n" % self.tcsType.value()) if self.isAbsolute(): f.write("absolute ") From ewt@specifixinc.com Mon Aug 9 09:08:28 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79D8SbI025698 for ; Mon, 9 Aug 2004 09:08:28 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id A1A4B1620B for ; Mon, 9 Aug 2004 06:08:59 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79D8vTD024132; Mon, 9 Aug 2004 09:08:57 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79D8va3024129; Mon, 9 Aug 2004 09:08:57 -0400 Date: Mon, 9 Aug 2004 09:08:57 -0400 From: ewt@specifixinc.com Message-Id: <200408091308.i79D8va3024129@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary filecontainer.py,1.32,1.33 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 13:08:29 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv24111 Modified Files: filecontainer.py Log Message: go ahead and change the version number -- with the changes to trove.py the file format has changed substantially Index: filecontainer.py =================================================================== RCS file: /cvs/conary/filecontainer.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- filecontainer.py 6 Aug 2004 17:21:46 -0000 1.32 +++ filecontainer.py 9 Aug 2004 13:08:55 -0000 1.33 @@ -64,7 +64,7 @@ import util FILE_CONTAINER_MAGIC = "\xEA\x3F\x81\xBB" -FILE_CONTAINER_VERSION = 3 +FILE_CONTAINER_VERSION = 4 SEEK_SET = 0 SEEK_CUR = 1 SEEK_END = 2 From ewt@specifixinc.com Mon Aug 9 09:10:14 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DAEbI025713 for ; Mon, 9 Aug 2004 09:10:14 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 93AC41620B for ; Mon, 9 Aug 2004 06:10:45 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DAhTD024260; Mon, 9 Aug 2004 09:10:43 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79DAhYG024257; Mon, 9 Aug 2004 09:10:43 -0400 Date: Mon, 9 Aug 2004 09:10:43 -0400 From: ewt@specifixinc.com Message-Id: <200408091310.i79DAhYG024257@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary filecontainer.py,1.33,1.34 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 13:10:14 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv24245 Modified Files: filecontainer.py Log Message: change version number to a timestamp for the last revision; this will make it realtively easy to match up versions w/ cvs state Index: filecontainer.py =================================================================== RCS file: /cvs/conary/filecontainer.py,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- filecontainer.py 9 Aug 2004 13:08:55 -0000 1.33 +++ filecontainer.py 9 Aug 2004 13:10:41 -0000 1.34 @@ -64,7 +64,7 @@ import util FILE_CONTAINER_MAGIC = "\xEA\x3F\x81\xBB" -FILE_CONTAINER_VERSION = 4 +FILE_CONTAINER_VERSION = 2004080901 SEEK_SET = 0 SEEK_CUR = 1 SEEK_END = 2 From ewt@specifixinc.com Mon Aug 9 09:38:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DcFbI025762 for ; Mon, 9 Aug 2004 09:38:15 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id E979C1620B for ; Mon, 9 Aug 2004 06:38:46 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DcjTD025243; Mon, 9 Aug 2004 09:38:45 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79DcjTv025240; Mon, 9 Aug 2004 09:38:45 -0400 Date: Mon, 9 Aug 2004 09:38:45 -0400 From: ewt@specifixinc.com Message-Id: <200408091338.i79DcjTv025240@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository repository.py,1.162,1.163 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 13:38:16 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv25213/repository Modified Files: repository.py Log Message: diffs weren't being applied properly on commits Index: repository.py =================================================================== RCS file: /cvs/conary/repository/repository.py,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- repository.py 5 Aug 2004 22:26:03 -0000 1.162 +++ repository.py 9 Aug 2004 13:38:43 -0000 1.163 @@ -607,16 +607,18 @@ troveInfo = self.addPackage(newPkg) - for (fileId, path, version) in newPkg.iterFileList(): + for (fileId, path, newVersion) in newPkg.iterFileList(): tuple = newFileMap.get(fileId, None) if tuple is not None: (oldPath, oldVersion) = tuple[-2:] + else: + oldVersion = None - if tuple is None or oldVersion == version: + if tuple is None or oldVersion == newVersion: # the file didn't change between versions; we can just # ignore it fileObj = None - elif oldVersion == version: + elif oldVersion == newVersion: fileObj = None else: diff = cs.getFileChange(fileId) @@ -635,7 +637,7 @@ fileObj = files.ThawFile(diff, fileId) oldfile = None - self.addFile(troveInfo, fileId, fileObj, path, version) + self.addFile(troveInfo, fileId, fileObj, path, newVersion) # files with contents need to be tracked so we can stick # there contents in the archive "soon"; config files need @@ -659,17 +661,17 @@ ## fileObj.contents.sha1(), ## fileObj.contents.size()) ## contType = changeset.ChangedFileTypes.file -## self.addFileContents(fileObj.contents.sha1(), version, +## self.addFileContents(fileObj.contents.sha1(), newVersion, ## fileContents, restoreContents, ## fileObj.flags.isConfig()) elif fileObj.flags.isConfig(): tup = (fileId, fileObj, oldPath, oldfile, pkgName, - oldTroveVersion, troveFlavor, version, - restoreContents) + oldTroveVersion, troveFlavor, newVersion, + oldVersion, restoreContents) configRestoreList.append(tup) else: - tup = (fileId, fileObj.contents.sha1(), version, + tup = (fileId, fileObj.contents.sha1(), newVersion, restoreContents) normalRestoreList.append(tup) @@ -680,7 +682,8 @@ normalRestoreList.sort() for (fileId, fileObj, oldPath, oldfile, pkgName, oldTroveVersion, - troveFlavor, version, restoreContents) in configRestoreList: + troveFlavor, newVersion, oldVersion, restoreContents) in \ + configRestoreList: (contType, fileContents) = cs.getFileContents(fileId) if contType == changeset.ChangedFileTypes.diff: assert(fileObj.flags.isConfig()) @@ -706,7 +709,7 @@ fileContents = filecontents.WithFailedHunks( fileContents, failedHunks) - self.addFileContents(fileObj.contents.sha1(), version, + self.addFileContents(fileObj.contents.sha1(), newVersion, fileContents, restoreContents, 1) normalRestoreList.sort() From dbc@specifixinc.com Mon Aug 9 09:40:49 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DenbI025772 for ; Mon, 9 Aug 2004 09:40:49 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 29F821620B for ; Mon, 9 Aug 2004 06:41:20 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DfHTD025399; Mon, 9 Aug 2004 09:41:17 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79DfHMU025397; Mon, 9 Aug 2004 09:41:17 -0400 Date: Mon, 9 Aug 2004 09:41:17 -0400 From: David Christian Message-Id: <200408091341.i79DfHMU025397@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build macros.py,1.8,1.9 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 13:40:49 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv24758 Modified Files: macros.py Log Message: Add copy-on-access shallow copying to macros Index: macros.py =================================================================== RCS file: /cvs/conary/build/macros.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- macros.py 13 Jul 2004 14:33:26 -0000 1.8 +++ macros.py 9 Aug 2004 13:41:15 -0000 1.9 @@ -17,11 +17,20 @@ """ class Macros(dict): + def __init__(self, macros={}, shadow=False): + if shadow: + self.__macros = macros + else: + self.update(macros) + def update(self, other): for key, item in other.iteritems(): self[key] = item def __setitem__(self, name, value): + if name[:7] == '_Macros': + dict.__setitem__(self, name, value) + return # only expand references to ourself d = {name: self.get(name)} # escape any macros in the new value @@ -33,15 +42,23 @@ def __setattr__(self, name, value): self.__setitem__(name, value) - - def __getitem__(self, name): - return dict.__getitem__(self, name) %self + def __getitem__(self, name): + if name[:7] == '_Macros': + return dict.__getitem__(self, name) + if not name in self: + # update on access + # okay for this to fail bc of no __macros + # -- equivalent to missing dict value + value = self.__macros[name] + self[name] = value + return value + else: + return dict.__getitem__(self, name) % self + def __getattr__(self, name): return self.__getitem__(name) - def copy(self): - new = Macros() - new.update(self) - return new - + def copy(self, shadow=True): + # shadow saves initial copying cost for a higher search cost + return Macros(self, shadow) From ewt@specifixinc.com Mon Aug 9 09:44:52 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DiqbI025780 for ; Mon, 9 Aug 2004 09:44:52 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 6F9B91620B for ; Mon, 9 Aug 2004 06:45:23 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DjLTD025802; Mon, 9 Aug 2004 09:45:21 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79DjLla025798; Mon, 9 Aug 2004 09:45:21 -0400 Date: Mon, 9 Aug 2004 09:45:21 -0400 From: ewt@specifixinc.com Message-Id: <200408091345.i79DjLla025798@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository repository.py,1.162,1.162.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 13:44:52 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv25662/repository Modified Files: Tag: conary-0_6_4-branch repository.py Log Message: fixes for applying patches during a commit (broke during the memory optimization changes) Index: repository.py =================================================================== RCS file: /cvs/conary/repository/repository.py,v retrieving revision 1.162 retrieving revision 1.162.2.1 diff -u -r1.162 -r1.162.2.1 --- repository.py 5 Aug 2004 22:26:03 -0000 1.162 +++ repository.py 9 Aug 2004 13:45:19 -0000 1.162.2.1 @@ -607,16 +607,18 @@ troveInfo = self.addPackage(newPkg) - for (fileId, path, version) in newPkg.iterFileList(): + for (fileId, path, newVersion) in newPkg.iterFileList(): tuple = newFileMap.get(fileId, None) if tuple is not None: (oldPath, oldVersion) = tuple[-2:] + else: + oldVersion = None - if tuple is None or oldVersion == version: + if tuple is None or oldVersion == newVersion: # the file didn't change between versions; we can just # ignore it fileObj = None - elif oldVersion == version: + elif oldVersion == newVersion: fileObj = None else: diff = cs.getFileChange(fileId) @@ -635,7 +637,7 @@ fileObj = files.ThawFile(diff, fileId) oldfile = None - self.addFile(troveInfo, fileId, fileObj, path, version) + self.addFile(troveInfo, fileId, fileObj, path, newVersion) # files with contents need to be tracked so we can stick # there contents in the archive "soon"; config files need @@ -659,17 +661,17 @@ ## fileObj.contents.sha1(), ## fileObj.contents.size()) ## contType = changeset.ChangedFileTypes.file -## self.addFileContents(fileObj.contents.sha1(), version, +## self.addFileContents(fileObj.contents.sha1(), newVersion, ## fileContents, restoreContents, ## fileObj.flags.isConfig()) elif fileObj.flags.isConfig(): tup = (fileId, fileObj, oldPath, oldfile, pkgName, - oldTroveVersion, troveFlavor, version, - restoreContents) + oldTroveVersion, troveFlavor, newVersion, + oldVersion, restoreContents) configRestoreList.append(tup) else: - tup = (fileId, fileObj.contents.sha1(), version, + tup = (fileId, fileObj.contents.sha1(), newVersion, restoreContents) normalRestoreList.append(tup) @@ -680,7 +682,8 @@ normalRestoreList.sort() for (fileId, fileObj, oldPath, oldfile, pkgName, oldTroveVersion, - troveFlavor, version, restoreContents) in configRestoreList: + troveFlavor, newVersion, oldVersion, restoreContents) in \ + configRestoreList: (contType, fileContents) = cs.getFileContents(fileId) if contType == changeset.ChangedFileTypes.diff: assert(fileObj.flags.isConfig()) @@ -706,7 +709,7 @@ fileContents = filecontents.WithFailedHunks( fileContents, failedHunks) - self.addFileContents(fileObj.contents.sha1(), version, + self.addFileContents(fileObj.contents.sha1(), newVersion, fileContents, restoreContents, 1) normalRestoreList.sort() From ewt@specifixinc.com Mon Aug 9 09:49:06 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79Dn5bI025790 for ; Mon, 9 Aug 2004 09:49:06 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 00FA11620B for ; Mon, 9 Aug 2004 06:49:36 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79DnZTD026259; Mon, 9 Aug 2004 09:49:35 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79DnZCx026256; Mon, 9 Aug 2004 09:49:35 -0400 Date: Mon, 9 Aug 2004 09:49:35 -0400 From: ewt@specifixinc.com Message-Id: <200408091349.i79DnZCx026256@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary filecontainer.py,1.34,1.35 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 13:49:06 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv26244 Modified Files: filecontainer.py Log Message: changed file container version to 4 byte value to hold timestamp Index: filecontainer.py =================================================================== RCS file: /cvs/conary/filecontainer.py,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- filecontainer.py 9 Aug 2004 13:10:41 -0000 1.34 +++ filecontainer.py 9 Aug 2004 13:49:32 -0000 1.35 @@ -170,10 +170,10 @@ if len(magic) != 4 or magic != FILE_CONTAINER_MAGIC: raise BadContainer, "bad magic" - version = self.file.read(2) - if len(version) != 2: + version = self.file.read(4) + if len(version) != 4: raise BadContainer, "invalid container version" - version = struct.unpack("!H", version)[0] + version = struct.unpack("!I", version)[0] if version != FILE_CONTAINER_VERSION: raise BadContainer, "unsupported file container version %d" % \ version @@ -314,7 +314,7 @@ self.file.seek(SEEK_SET, 0) self.file.truncate() self.file.write(FILE_CONTAINER_MAGIC) - self.file.write(struct.pack("!H", FILE_CONTAINER_VERSION)) + self.file.write(struct.pack("!I", FILE_CONTAINER_VERSION)) self.mutable = True self.rest = gzip.GzipFile(None, "wb", 9, self.file) From msw@specifixinc.com Mon Aug 9 10:04:48 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79E4lbI025814 for ; Mon, 9 Aug 2004 10:04:47 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id F26641620B for ; Mon, 9 Aug 2004 07:05:18 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79E5HTD027041; Mon, 9 Aug 2004 10:05:17 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79E5H99027038; Mon, 9 Aug 2004 10:05:17 -0400 Date: Mon, 9 Aug 2004 10:05:17 -0400 From: Matt Wilson Message-Id: <200408091405.i79E5H99027038@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/scripts Precedence: first-class Cc: Subject: conary/scripts outofdate,1.5,1.6 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:04:48 -0000 Update of /mnt/specifix/cvs/conary/scripts In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv27020 Modified Files: outofdate Log Message: remove hardcoded fullPath Index: outofdate =================================================================== RCS file: /mnt/specifix/cvs/conary/scripts/outofdate,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- outofdate 4 Aug 2004 21:16:19 -0000 1.5 +++ outofdate 9 Aug 2004 14:05:15 -0000 1.6 @@ -24,8 +24,6 @@ else: fullPath = os.getcwd() -fullPath = '/home/dbc/spx/cvs/conary/' - sys.path.append(os.path.dirname(fullPath)) import conarycfg From ewt@specifixinc.com Mon Aug 9 10:10:31 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EAVbI025832 for ; Mon, 9 Aug 2004 10:10:31 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3D4F61620B for ; Mon, 9 Aug 2004 07:11:02 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EAvTD027587; Mon, 9 Aug 2004 10:10:57 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79EAvLP027584; Mon, 9 Aug 2004 10:10:57 -0400 Date: Mon, 9 Aug 2004 10:10:57 -0400 From: ewt@specifixinc.com Message-Id: <200408091410.i79EAvLP027584@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary queryrep.py,1.22,1.22.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:10:31 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv27566 Modified Files: Tag: conary-0_6_4-branch queryrep.py Log Message: give better error messages when troves weren't found for a given label Index: queryrep.py =================================================================== RCS file: /cvs/conary/queryrep.py,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -r1.22 -r1.22.2.1 --- queryrep.py 30 Jul 2004 18:08:32 -0000 1.22 +++ queryrep.py 9 Aug 2004 14:10:55 -0000 1.22.2.1 @@ -57,8 +57,13 @@ for troveName in troves: if not flavors[troveName]: - log.error('No versions for "%s" were found in the repository', - troveName) + if all or leaves: + log.error('No versions for "%s" were found in the ' + 'repository', troveName) + else: + log.error('No versions with label "%s" for "%s" were ' + 'found in the repository.', + cfg.installLabel.asString(), troveName) continue versionStrs = {} From ewt@specifixinc.com Mon Aug 9 10:12:06 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EC5bI025840 for ; Mon, 9 Aug 2004 10:12:06 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 268521620B for ; Mon, 9 Aug 2004 07:12:37 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79ECZTD027851; Mon, 9 Aug 2004 10:12:35 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79ECZDE027848; Mon, 9 Aug 2004 10:12:35 -0400 Date: Mon, 9 Aug 2004 10:12:35 -0400 From: ewt@specifixinc.com Message-Id: <200408091412.i79ECZDE027848@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary queryrep.py,1.22,1.23 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:12:06 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv27735 Modified Files: queryrep.py Log Message: give a better error message when a trove doesn't exist in the repository for the given label Index: queryrep.py =================================================================== RCS file: /cvs/conary/queryrep.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- queryrep.py 30 Jul 2004 18:08:32 -0000 1.22 +++ queryrep.py 9 Aug 2004 14:12:33 -0000 1.23 @@ -57,8 +57,13 @@ for troveName in troves: if not flavors[troveName]: - log.error('No versions for "%s" were found in the repository', - troveName) + if all or leaves: + log.error('No versions for "%s" were found in the ' + 'repository', troveName) + else: + log.error('No versions with label "%s" for "%s" were ' + 'found in the repository.', + cfg.installLabel.asString(), troveName) continue versionStrs = {} From johnsonm@specifixinc.com Mon Aug 9 10:27:44 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79ERhbI025916 for ; Mon, 9 Aug 2004 10:27:44 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 1940F1620B for ; Mon, 9 Aug 2004 07:28:15 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79ESDTD028415; Mon, 9 Aug 2004 10:28:13 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79ESDLx028411; Mon, 9 Aug 2004 10:28:13 -0400 Date: Mon, 9 Aug 2004 10:28:13 -0400 From: johnsonm@specifixinc.com Message-Id: <200408091428.i79ESDLx028411@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build build.py,1.176,1.176.2.1 action.py,1.10,1.10.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:27:44 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv28399 Modified Files: Tag: conary-0_6_4-branch build.py action.py Log Message: Allow for stacked excepthook overrides (merge from HEAD) Index: build.py =================================================================== RCS file: /spx/cvs/conary/build/build.py,v retrieving revision 1.176 retrieving revision 1.176.2.1 diff -u -r1.176 -r1.176.2.1 --- build.py 5 Aug 2004 22:09:32 -0000 1.176 +++ build.py 9 Aug 2004 14:28:11 -0000 1.176.2.1 @@ -66,10 +66,11 @@ if self.linenum is None: self.do(self.recipe.macros) else: + oldexcepthook = sys.excepthook sys.excepthook = action.excepthook action.actionobject = self self.do(self.recipe.macros) - sys.excepthook = sys.__excepthook__ + sys.excepthook = oldexcepthook def do(self, macros): """ Index: action.py =================================================================== RCS file: /spx/cvs/conary/build/action.py,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -r1.10 -r1.10.2.1 --- action.py 5 Aug 2004 22:09:32 -0000 1.10 +++ action.py 9 Aug 2004 14:28:11 -0000 1.10.2.1 @@ -152,10 +152,11 @@ if self.linenum is None: self.do() else: + oldexcepthook = sys.excepthook sys.excepthook = excepthook actionobject = self self.do() - sys.excepthook = sys.__excepthook__ + sys.excepthook = oldexcepthook def do(self): From msw@specifixinc.com Mon Aug 9 10:37:40 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EbebI025933 for ; Mon, 9 Aug 2004 10:37:40 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id ADF6E1620B for ; Mon, 9 Aug 2004 07:38:11 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79Ec9TD029191; Mon, 9 Aug 2004 10:38:09 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79Ec9qM029188; Mon, 9 Aug 2004 10:38:09 -0400 Date: Mon, 9 Aug 2004 10:38:09 -0400 From: Matt Wilson Message-Id: <200408091438.i79Ec9qM029188@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local database.py,1.134,1.135 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:37:40 -0000 Update of /mnt/specifix/cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv29176 Modified Files: database.py Log Message: use the old flavor to look up old troves in the database Index: database.py =================================================================== RCS file: /mnt/specifix/cvs/conary/local/database.py,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- database.py 5 Aug 2004 22:26:03 -0000 1.134 +++ database.py 9 Aug 2004 14:38:07 -0000 1.135 @@ -318,8 +318,9 @@ oldVersion = pkgCs.getOldVersion() if not oldVersion: continue - pristine = self.getTrove(name, oldVersion, flavor, pristine = True) - changed = self.getTrove(name, oldVersion, flavor) + oldFlavor = pkgCs.getOldFlavor() + pristine = self.getTrove(name, oldVersion, oldFlavor, pristine = True) + changed = self.getTrove(name, oldVersion, oldFlavor) for (subName, subVersion, subFlavor) in pristine.iterTroveList(): if not changed.hasTrove(subName, subVersion, subFlavor): From msw@specifixinc.com Mon Aug 9 10:39:44 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EdibI025941 for ; Mon, 9 Aug 2004 10:39:44 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id A5DC41620B for ; Mon, 9 Aug 2004 07:40:15 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EeETD029396; Mon, 9 Aug 2004 10:40:14 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79EeD9s029393; Mon, 9 Aug 2004 10:40:13 -0400 Date: Mon, 9 Aug 2004 10:40:13 -0400 From: Matt Wilson Message-Id: <200408091440.i79EeD9s029393@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/deps Precedence: first-class Cc: Subject: conary/deps .cvsignore,1.1,1.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:39:44 -0000 Update of /mnt/specifix/cvs/conary/deps In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv29380 Modified Files: .cvsignore Log Message: ignore .pyo files Index: .cvsignore =================================================================== RCS file: /mnt/specifix/cvs/conary/deps/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2004 19:43:31 -0000 1.1 +++ .cvsignore 9 Aug 2004 14:40:11 -0000 1.2 @@ -1 +1,2 @@ *.pyc +*.pyo From msw@specifixinc.com Mon Aug 9 10:39:58 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EdwbI025949 for ; Mon, 9 Aug 2004 10:39:58 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 912951620B for ; Mon, 9 Aug 2004 07:40:29 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EeRTD029458; Mon, 9 Aug 2004 10:40:27 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79EeR4d029455; Mon, 9 Aug 2004 10:40:27 -0400 Date: Mon, 9 Aug 2004 10:40:27 -0400 From: Matt Wilson Message-Id: <200408091440.i79EeR4d029455@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/lib Precedence: first-class Cc: Subject: conary/lib .cvsignore,1.1,1.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:39:58 -0000 Update of /mnt/specifix/cvs/conary/lib In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv29443 Modified Files: .cvsignore Log Message: ignore .pyo files Index: .cvsignore =================================================================== RCS file: /mnt/specifix/cvs/conary/lib/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2004 19:43:56 -0000 1.1 +++ .cvsignore 9 Aug 2004 14:40:25 -0000 1.2 @@ -1 +1,2 @@ *.pyc +*.pyo From msw@specifixinc.com Mon Aug 9 10:41:46 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EfkbI025965 for ; Mon, 9 Aug 2004 10:41:46 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3F85B1620B for ; Mon, 9 Aug 2004 07:42:17 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EgFTD029735; Mon, 9 Aug 2004 10:42:15 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79EgFlp029732; Mon, 9 Aug 2004 10:42:15 -0400 Date: Mon, 9 Aug 2004 10:42:15 -0400 From: Matt Wilson Message-Id: <200408091442.i79EgFlp029732@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local database.py,1.134,1.134.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:41:46 -0000 Update of /mnt/specifix/cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv29720 Modified Files: Tag: conary-0_6_4-branch database.py Log Message: use the old flavor to look up old troves in the database Index: database.py =================================================================== RCS file: /mnt/specifix/cvs/conary/local/database.py,v retrieving revision 1.134 retrieving revision 1.134.2.1 diff -u -r1.134 -r1.134.2.1 --- database.py 5 Aug 2004 22:26:03 -0000 1.134 +++ database.py 9 Aug 2004 14:42:13 -0000 1.134.2.1 @@ -318,8 +318,9 @@ oldVersion = pkgCs.getOldVersion() if not oldVersion: continue - pristine = self.getTrove(name, oldVersion, flavor, pristine = True) - changed = self.getTrove(name, oldVersion, flavor) + oldFlavor = pkgCs.getOldFlavor() + pristine = self.getTrove(name, oldVersion, oldFlavor, pristine = True) + changed = self.getTrove(name, oldVersion, oldFlavor) for (subName, subVersion, subFlavor) in pristine.iterTroveList(): if not changed.hasTrove(subName, subVersion, subFlavor): From msw@specifixinc.com Mon Aug 9 10:46:00 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79Ek0bI025975 for ; Mon, 9 Aug 2004 10:46:00 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 5EDDD1620B for ; Mon, 9 Aug 2004 07:46:31 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EkTTD029974; Mon, 9 Aug 2004 10:46:29 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79EkT0J029971; Mon, 9 Aug 2004 10:46:29 -0400 Date: Mon, 9 Aug 2004 10:46:29 -0400 From: Matt Wilson Message-Id: <200408091446.i79EkT0J029971@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary Makefile,1.71,1.71.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:46:01 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv29959 Modified Files: Tag: conary-0_6_4-branch Makefile Log Message: 0.6.5 Index: Makefile =================================================================== RCS file: /mnt/specifix/cvs/conary/Makefile,v retrieving revision 1.71 retrieving revision 1.71.2.1 diff -u -r1.71 -r1.71.2.1 --- Makefile 6 Aug 2004 15:35:17 -0000 1.71 +++ Makefile 9 Aug 2004 14:46:27 -0000 1.71.2.1 @@ -14,7 +14,7 @@ all: subdirs conary-wrapper -export VERSION = 0.6.4 +export VERSION = 0.6.5 export TOPDIR = $(shell pwd) export DISTDIR = $(TOPDIR)/conary-$(VERSION) export prefix = /usr From johnsonm@specifixinc.com Mon Aug 9 10:52:54 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EqrbI026087 for ; Mon, 9 Aug 2004 10:52:53 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 8B8F31620B for ; Mon, 9 Aug 2004 07:53:24 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79ErMTD030272; Mon, 9 Aug 2004 10:53:22 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79ErMvm030268; Mon, 9 Aug 2004 10:53:22 -0400 Date: Mon, 9 Aug 2004 10:53:22 -0400 From: johnsonm@specifixinc.com Message-Id: <200408091453.i79ErMvm030268@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build recipe.py,1.231,1.231.2.1 source.py,1.29,1.29.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:52:54 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv30256 Modified Files: Tag: conary-0_6_4-branch recipe.py source.py Log Message: do not prep sources unless we are actually going to use them Index: recipe.py =================================================================== RCS file: /spx/cvs/conary/build/recipe.py,v retrieving revision 1.231 retrieving revision 1.231.2.1 diff -u -r1.231 -r1.231.2.1 --- recipe.py 5 Aug 2004 21:10:42 -0000 1.231 +++ recipe.py 9 Aug 2004 14:53:20 -0000 1.231.2.1 @@ -344,6 +344,8 @@ def unpackSources(self, builddir): self.macros.builddir = builddir for source in self._sources: + source.doPrep() + for source in self._sources: source.doAction() def extraBuild(self, action): Index: source.py =================================================================== RCS file: /spx/cvs/conary/build/source.py,v retrieving revision 1.29 retrieving revision 1.29.2.1 diff -u -r1.29 -r1.29.2.1 --- source.py 4 Aug 2004 01:11:01 -0000 1.29 +++ source.py 9 Aug 2004 14:53:20 -0000 1.29.2.1 @@ -38,9 +38,8 @@ action.RecipeAction.__init__(self, recipe, *args, **keywords) self.sourcename = sourcename % recipe.macros self.rpm = self.rpm % recipe.macros - self.prep() - def prep(self): + def doPrep(self): if self.keyid: self._addSignature() if self.rpm: @@ -402,6 +401,9 @@ util.mkdirChain(destDir) util.execute(self.action %self.recipe.macros, destDir) + def doPrep(self): + pass + def fetch(self): return None From johnsonm@specifixinc.com Mon Aug 9 10:55:53 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EtqbI026099 for ; Mon, 9 Aug 2004 10:55:53 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id D83D51620B for ; Mon, 9 Aug 2004 07:56:23 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79EuMTD030762; Mon, 9 Aug 2004 10:56:22 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79EuMNR030758; Mon, 9 Aug 2004 10:56:22 -0400 Date: Mon, 9 Aug 2004 10:56:22 -0400 From: johnsonm@specifixinc.com Message-Id: <200408091456.i79EuMNR030758@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build recipe.py,1.232,1.233 source.py,1.30,1.31 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 14:55:53 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv30746 Modified Files: recipe.py source.py Log Message: do not prep sources unless we are actually going to use them Index: recipe.py =================================================================== RCS file: /spx/cvs/conary/build/recipe.py,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- recipe.py 6 Aug 2004 17:36:50 -0000 1.232 +++ recipe.py 9 Aug 2004 14:56:20 -0000 1.233 @@ -344,6 +344,8 @@ def unpackSources(self, builddir): self.macros.builddir = builddir for source in self._sources: + source.doPrep() + for source in self._sources: source.doAction() def extraBuild(self, action): Index: source.py =================================================================== RCS file: /spx/cvs/conary/build/source.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- source.py 6 Aug 2004 19:51:03 -0000 1.30 +++ source.py 9 Aug 2004 14:56:20 -0000 1.31 @@ -38,9 +38,8 @@ action.RecipeAction.__init__(self, recipe, *args, **keywords) self.sourcename = sourcename % recipe.macros self.rpm = self.rpm % recipe.macros - self.prep() - def prep(self): + def doPrep(self): if self.keyid: self._addSignature() if self.rpm: @@ -402,6 +401,9 @@ util.mkdirChain(destDir) util.execute(self.action %self.recipe.macros, destDir) + def doPrep(self): + pass + def fetch(self): return None From ewt@specifixinc.com Mon Aug 9 11:08:51 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79F8obI026131 for ; Mon, 9 Aug 2004 11:08:51 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 03A851620B for ; Mon, 9 Aug 2004 08:09:22 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79F9KTD031251; Mon, 9 Aug 2004 11:09:20 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79F9KsR031248; Mon, 9 Aug 2004 11:09:20 -0400 Date: Mon, 9 Aug 2004 11:09:20 -0400 From: ewt@specifixinc.com Message-Id: <200408091509.i79F9KsR031248@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.144,1.145 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 15:08:51 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv31230 Modified Files: trove.py Log Message: got rid of the line-oriented package list Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- trove.py 9 Aug 2004 01:57:51 -0000 1.144 +++ trove.py 9 Aug 2004 15:09:18 -0000 1.145 @@ -549,14 +549,67 @@ self.requires = None self.changeLog = changeLog -_STREAM_TCS_NAME = streams._STREAM_TROVE_CHANGE_SET + 0 -_STREAM_TCS_OLD_VERSION = streams._STREAM_TROVE_CHANGE_SET + 1 -_STREAM_TCS_NEW_VERSION = streams._STREAM_TROVE_CHANGE_SET + 2 -_STREAM_TCS_REQUIRES = streams._STREAM_TROVE_CHANGE_SET + 3 -_STREAM_TCS_PROVIDES = streams._STREAM_TROVE_CHANGE_SET + 4 -_STREAM_TCS_CHANGE_LOG = streams._STREAM_TROVE_CHANGE_SET + 5 -_STREAM_TCS_OLD_FILES = streams._STREAM_TROVE_CHANGE_SET + 6 -_STREAM_TCS_TYPE = streams._STREAM_TROVE_CHANGE_SET + 7 +class ReferencedTroveSet(streams.InfoStream, dict): + + def freeze(self): + l = [] + for name, troveList in self.iteritems(): + subL = [] + for (change, version, flavor) in troveList: + version = version.freeze() + if flavor: + flavor = flavor.freeze() + else: + flavor = "-" + + subL.append(change) + subL.append(version) + subL.append(flavor) + + l.append(name) + l += subL + l.append("") + + return "\0".join(l) + + def thaw(self, data): + l = data.split("\0") + i = 0 + + while i < len(l): + name = l[i] + self[name] = [] + + i += 1 + while l[i]: + change = l[i] + version = versions.ThawVersion(l[i + 1]) + flavor = l[i + 2] + + if flavor == "-": + flavor = None + else: + flavor = deps.ThawDependencySet(flavor) + + self[name].append((change, version, flavor)) + i += 3 + + i += 1 + + def __init__(self, data = None): + dict.__init__(self) + if data is not None: + self.thaw(data) + +_STREAM_TCS_NAME = streams._STREAM_TROVE_CHANGE_SET + 0 +_STREAM_TCS_OLD_VERSION = streams._STREAM_TROVE_CHANGE_SET + 1 +_STREAM_TCS_NEW_VERSION = streams._STREAM_TROVE_CHANGE_SET + 2 +_STREAM_TCS_REQUIRES = streams._STREAM_TROVE_CHANGE_SET + 3 +_STREAM_TCS_PROVIDES = streams._STREAM_TROVE_CHANGE_SET + 4 +_STREAM_TCS_CHANGE_LOG = streams._STREAM_TROVE_CHANGE_SET + 5 +_STREAM_TCS_OLD_FILES = streams._STREAM_TROVE_CHANGE_SET + 6 +_STREAM_TCS_TYPE = streams._STREAM_TROVE_CHANGE_SET + 7 +_STREAM_TCS_TROVE_CHANGES = streams._STREAM_TROVE_CHANGE_SET + 8 _TCS_TYPE_ABSOLUTE = 1 _TCS_TYPE_RELATIVE = 2 @@ -572,6 +625,7 @@ _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog, "changeLog" ), _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), _STREAM_TCS_TYPE : (streams.IntStream, "tcsType" ), + _STREAM_TCS_TROVE_CHANGES : (ReferencedTroveSet, "packages" ), } """ @@ -740,7 +794,7 @@ later be parsed by parse(). The representation begins with a header:: - ABS || + AwBS || CS || NEW [REQUIRES ] @@ -782,26 +836,10 @@ else: rc.append(" -\n") - lines = [] - for name in self.packages.keys(): - list = [] - for (kind, version, flavor) in self.packages[name]: - if flavor: - list.append(kind + version.freeze() + - "|" + flavor.freeze()) - else: - list.append(kind + version.freeze() + - "|") - - lines.append("p " + name + " " + " ".join(list)) - - if lines: - rc.append("\n".join(lines) + "\n") - newStyle = "" rc = "".join(rc) - final = struct.pack("!H", len(rc)) + rc + \ + final = struct.pack("!I", len(rc)) + rc + \ streams.StreamSet.freeze(self) return final @@ -846,7 +884,7 @@ self.tcsType.set(_TCS_TYPE_ABSOLUTE) else: self.tcsType.set(_TCS_TYPE_RELATIVE) - self.packages = {} + self.packages = ReferencedTroveSet() self.provides.set(None) self.requires.set(None) self.oldFlavor = oldFlavor @@ -877,32 +915,14 @@ self.changedFile(fileId, path, version) elif action == "-": self.oldFile(line[1:]) - elif action == "p": - fields = line[2:].split() - name = fields[0] - for item in fields[1:]: - op = item[0] - v,f = item[1:].split("|", 1) - v = versions.ThawVersion(v) - if f: - f = deps.ThawDependencySet(f) - else: - f = None - - assert(op == "+" or op == "-") - - if op == "+": - self.newTroveVersion(name, v, f) - else: # op == "-" - self.oldTroveVersion(name, v, f) # this makes our order match the order in the changeset self.changedFiles.sort() def __init__(self, buf): - oldSize = struct.unpack("!H", buf[0:2])[0] - newStyle = buf[oldSize + 2:] - buf = buf[2:oldSize + 2] + oldSize = struct.unpack("!I", buf[0:4])[0] + newStyle = buf[oldSize + 4:] + buf = buf[4:oldSize + 4] AbstractTroveChangeSet.__init__(self, newStyle) @@ -929,7 +949,6 @@ self.newFiles = [] self.changedFiles = [] - self.packages = {} self.oldFlavor = oldFlavor self.newFlavor = newFlavor From johnsonm@specifixinc.com Mon Aug 9 11:34:42 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79FYgbI026167 for ; Mon, 9 Aug 2004 11:34:42 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id AC74D1620B for ; Mon, 9 Aug 2004 08:35:13 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79FZCTD032541; Mon, 9 Aug 2004 11:35:12 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79FZCrc032536; Mon, 9 Aug 2004 11:35:12 -0400 Date: Mon, 9 Aug 2004 11:35:12 -0400 From: johnsonm@specifixinc.com Message-Id: <200408091535.i79FZCrc032536@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build buildpackage.py, 1.54, 1.54.2.1 packagepolicy.py, 1.117, 1.117.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 15:34:42 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv32518/build Modified Files: Tag: conary-0_6_4-branch buildpackage.py packagepolicy.py Log Message: Cowardlily refusing to create empty package... Index: buildpackage.py =================================================================== RCS file: /spx/cvs/conary/build/buildpackage.py,v retrieving revision 1.54 retrieving revision 1.54.2.1 diff -u -r1.54 -r1.54.2.1 --- buildpackage.py 3 Aug 2004 21:50:24 -0000 1.54 +++ buildpackage.py 9 Aug 2004 15:35:10 -0000 1.54.2.1 @@ -178,6 +178,18 @@ self.pathMap[path] = pkg.getFile(path) self.pkgMap[path] = pkg + def delFile(self, path): + """ + Remove a file from the package and from the caches. + + @param path: path to remove from the BuildPackage + @type path: str + @rtype: None + """ + del self.pkgMap[path][path] + del self.pkgMap[path] + del self.pathMap[path] + def addDevice(self, path, devtype, major, minor, owner='root', group='root', perms=0660): """ Index: packagepolicy.py =================================================================== RCS file: /spx/cvs/conary/build/packagepolicy.py,v retrieving revision 1.117 retrieving revision 1.117.2.1 diff -u -r1.117 -r1.117.2.1 --- packagepolicy.py 5 Aug 2004 00:41:41 -0000 1.117 +++ packagepolicy.py 9 Aug 2004 15:35:10 -0000 1.117.2.1 @@ -817,9 +817,7 @@ log.debug('excluding directory %s with mode %o', path, mode&0777) elif not os.listdir(fullpath): log.debug('excluding empty directory %s', path) - del self.recipe.autopkg.pkgMap[path][path] - del self.recipe.autopkg.pkgMap[path] - del self.recipe.autopkg.pathMap[path] + self.recipe.autopkg.delFile(path) class _requirements(policy.Policy): From johnsonm@specifixinc.com Mon Aug 9 11:34:43 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79FYgbI026168 for ; Mon, 9 Aug 2004 11:34:42 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 053B616759 for ; Mon, 9 Aug 2004 08:35:14 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79FZCTD032540; Mon, 9 Aug 2004 11:35:12 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79FZCGe032532; Mon, 9 Aug 2004 11:35:12 -0400 Date: Mon, 9 Aug 2004 11:35:12 -0400 From: johnsonm@specifixinc.com Message-Id: <200408091535.i79FZCGe032532@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary cook.py,1.215,1.215.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 15:34:43 -0000 Update of /spx/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv32518 Modified Files: Tag: conary-0_6_4-branch cook.py Log Message: Cowardlily refusing to create empty package... Index: cook.py =================================================================== RCS file: /spx/cvs/conary/cook.py,v retrieving revision 1.215 retrieving revision 1.215.2.1 diff -u -r1.215 -r1.215.2.1 --- cook.py 5 Aug 2004 22:09:32 -0000 1.215 +++ cook.py 9 Aug 2004 15:35:10 -0000 1.215.2.1 @@ -467,6 +467,11 @@ flavor = deps.deps.DependencySet() bldList = recipeObj.getPackages() + if not bldList: + # no components in packages + log.warning('Cowardlily refusing to create empty package %s' + %recipeClass.name) + return for buildPkg in bldList: flavor.union(buildPkg.flavor) From johnsonm@specifixinc.com Mon Aug 9 11:36:07 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79Fa6bI026188 for ; Mon, 9 Aug 2004 11:36:07 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 400F61620B for ; Mon, 9 Aug 2004 08:36:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79FaaTD000429; Mon, 9 Aug 2004 11:36:36 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79FaapY000424; Mon, 9 Aug 2004 11:36:36 -0400 Date: Mon, 9 Aug 2004 11:36:36 -0400 From: johnsonm@specifixinc.com Message-Id: <200408091536.i79FaapY000424@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build buildpackage.py, 1.54, 1.55 packagepolicy.py, 1.118, 1.119 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 15:36:07 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv406/build Modified Files: buildpackage.py packagepolicy.py Log Message: Cowardlily refusing to create empty package... Index: buildpackage.py =================================================================== RCS file: /spx/cvs/conary/build/buildpackage.py,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- buildpackage.py 3 Aug 2004 21:50:24 -0000 1.54 +++ buildpackage.py 9 Aug 2004 15:36:34 -0000 1.55 @@ -178,6 +178,18 @@ self.pathMap[path] = pkg.getFile(path) self.pkgMap[path] = pkg + def delFile(self, path): + """ + Remove a file from the package and from the caches. + + @param path: path to remove from the BuildPackage + @type path: str + @rtype: None + """ + del self.pkgMap[path][path] + del self.pkgMap[path] + del self.pathMap[path] + def addDevice(self, path, devtype, major, minor, owner='root', group='root', perms=0660): """ Index: packagepolicy.py =================================================================== RCS file: /spx/cvs/conary/build/packagepolicy.py,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- packagepolicy.py 6 Aug 2004 17:37:44 -0000 1.118 +++ packagepolicy.py 9 Aug 2004 15:36:34 -0000 1.119 @@ -823,9 +823,7 @@ log.debug('excluding directory %s with mode %o', path, mode&0777) elif not os.listdir(fullpath): log.debug('excluding empty directory %s', path) - del self.recipe.autopkg.pkgMap[path][path] - del self.recipe.autopkg.pkgMap[path] - del self.recipe.autopkg.pathMap[path] + self.recipe.autopkg.delFile(path) class _requirements(policy.Policy): From johnsonm@specifixinc.com Mon Aug 9 11:36:07 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79Fa7bI026189 for ; Mon, 9 Aug 2004 11:36:07 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 905F416759 for ; Mon, 9 Aug 2004 08:36:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79FaaTD000428; Mon, 9 Aug 2004 11:36:36 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79FaaLe000421; Mon, 9 Aug 2004 11:36:36 -0400 Date: Mon, 9 Aug 2004 11:36:36 -0400 From: johnsonm@specifixinc.com Message-Id: <200408091536.i79FaaLe000421@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary cook.py,1.216,1.217 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 15:36:07 -0000 Update of /spx/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv406 Modified Files: cook.py Log Message: Cowardlily refusing to create empty package... Index: cook.py =================================================================== RCS file: /spx/cvs/conary/cook.py,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- cook.py 6 Aug 2004 17:36:50 -0000 1.216 +++ cook.py 9 Aug 2004 15:36:34 -0000 1.217 @@ -468,6 +468,11 @@ flavor = deps.deps.DependencySet() bldList = recipeObj.getPackages() + if not bldList: + # no components in packages + log.warning('Cowardlily refusing to create empty package %s' + %recipeClass.name) + return for buildPkg in bldList: flavor.union(buildPkg.flavor) From ewt@specifixinc.com Mon Aug 9 14:01:32 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79I1VbI026464 for ; Mon, 9 Aug 2004 14:01:32 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 1C77F16745 for ; Mon, 9 Aug 2004 11:02:03 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79I21TD004632; Mon, 9 Aug 2004 14:02:01 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79I21V2004629; Mon, 9 Aug 2004 14:02:01 -0400 Date: Mon, 9 Aug 2004 14:02:01 -0400 From: ewt@specifixinc.com Message-Id: <200408091802.i79I21V2004629@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.12,1.13 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 18:01:32 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv4609 Modified Files: streams.py Log Message: added LargeStreamSet object Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- streams.py 8 Aug 2004 17:11:51 -0000 1.12 +++ streams.py 9 Aug 2004 18:01:59 -0000 1.13 @@ -412,6 +412,9 @@ class StreamSet(InfoStream): + headerFormat = "!BH" + headerSize = 3 + def __init__(self, data = None): for streamType, name in self.streamDict.itervalues(): self.__setattr__(name, streamType()) @@ -421,9 +424,10 @@ dataLen = len(data) while i < dataLen: assert(i < dataLen) - (streamId, size) = struct.unpack("!BH", data[i:i+3]) + (streamId, size) = struct.unpack(self.headerFormat, + data[i:i + self.headerSize]) (streamType, name) = self.streamDict[streamId] - i += 3 + i += self.headerSize self.__setattr__(name, streamType(data[i:i + size])) i += size @@ -432,12 +436,12 @@ def diff(self, other): if self.lsTag != other.lsTag: d = self.freeze() - return struct.pack("!BH", 0, len(d)) + d + return struct.pack(self.headerFormat, 0, len(d)) + d rc = [ "\x01", self.lsTag ] for streamId, (streamType, name) in self.streamDict.iteritems(): d = self.__getattribute__(name).diff(other.__getattribute__(name)) - rc.append(struct.pack("!BH", streamId, len(d)) + d) + rc.append(struct.pack(self.headerFormat, streamId, len(d)) + d) return "".join(rc) @@ -456,7 +460,7 @@ for streamId, (streamType, name) in self.streamDict.iteritems(): s = self.__getattribute__(name).freeze() if len(s): - rc.append(struct.pack("!BH", streamId, len(s)) + s) + rc.append(struct.pack(self.headerFormat, streamId, len(s)) + s) return "".join(rc) def copy(self): @@ -471,11 +475,12 @@ conflicts = False while i < len(diff): - streamId, size = struct.unpack("!BH", diff[i:i+3]) + streamId, size = struct.unpack(self.headerFormat, + diff[i:i + self.headerSize]) streamType, name = self.streamDict[streamId] - i += 3 + i += self.headerSize if name != skip: w = self.__getattribute__(name).twm(diff[i:i+size], base.__getattribute__(name)) @@ -485,3 +490,8 @@ assert(i == len(diff)) return conflicts + +class LargeStreamSet(StreamSet): + + headerFormat = "!BI" + headerSize = 5 From ewt@specifixinc.com Mon Aug 9 14:01:39 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79I1dbI026485 for ; Mon, 9 Aug 2004 14:01:39 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id BECE816745 for ; Mon, 9 Aug 2004 11:02:10 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79I28TD004690; Mon, 9 Aug 2004 14:02:08 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79I28wx004686; Mon, 9 Aug 2004 14:02:08 -0400 Date: Mon, 9 Aug 2004 14:02:08 -0400 From: ewt@specifixinc.com Message-Id: <200408091802.i79I28wx004686@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.145,1.146 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 18:01:40 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv4656 Modified Files: trove.py Log Message: moved new file list to a stream Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- trove.py 9 Aug 2004 15:09:18 -0000 1.145 +++ trove.py 9 Aug 2004 18:02:06 -0000 1.146 @@ -549,7 +549,7 @@ self.requires = None self.changeLog = changeLog -class ReferencedTroveSet(streams.InfoStream, dict): +class ReferencedTroveSet(dict, streams.InfoStream): def freeze(self): l = [] @@ -573,6 +573,8 @@ return "\0".join(l) def thaw(self, data): + if not data: return + l = data.split("\0") i = 0 @@ -601,6 +603,52 @@ if data is not None: self.thaw(data) +class ReferencedFileList(list, streams.InfoStream): + + def freeze(self): + l = [] + for (fileId, path, version) in self: + l.append(fileId) + if path: + l.append(path) + else: + l.append("") + + if version: + l.append(version.asString()) + else: + l.append("") + + return "\0".join(l) + + def thaw(self, data): + del self[:] + if not data: + return + + l = data.split("\0") + i = 0 + while i < len(l): + fileId = l[i] + if l[i + 1]: + path = l[i + 1] + else: + path = None + + if l[i + 2]: + version = versions.VersionFromString(l[i + 2]) + else: + version = None + + self.append((fileId, path, version)) + + i += 3 + + def __init__(self, data = None): + list.__init__(self) + if data is not None: + self.thaw(data) + _STREAM_TCS_NAME = streams._STREAM_TROVE_CHANGE_SET + 0 _STREAM_TCS_OLD_VERSION = streams._STREAM_TROVE_CHANGE_SET + 1 _STREAM_TCS_NEW_VERSION = streams._STREAM_TROVE_CHANGE_SET + 2 @@ -610,11 +658,12 @@ _STREAM_TCS_OLD_FILES = streams._STREAM_TROVE_CHANGE_SET + 6 _STREAM_TCS_TYPE = streams._STREAM_TROVE_CHANGE_SET + 7 _STREAM_TCS_TROVE_CHANGES = streams._STREAM_TROVE_CHANGE_SET + 8 +_STREAM_TCS_NEW_FILES = streams._STREAM_TROVE_CHANGE_SET + 9 _TCS_TYPE_ABSOLUTE = 1 _TCS_TYPE_RELATIVE = 2 -class AbstractTroveChangeSet(streams.StreamSet): +class AbstractTroveChangeSet(streams.LargeStreamSet): streamDict = { _STREAM_TCS_NAME : (streams.StringStream, "name"), @@ -625,7 +674,8 @@ _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog, "changeLog" ), _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), _STREAM_TCS_TYPE : (streams.IntStream, "tcsType" ), - _STREAM_TCS_TROVE_CHANGES : (ReferencedTroveSet, "packages" ), + _STREAM_TCS_TROVE_CHANGES:(ReferencedTroveSet, "packages" ), + _STREAM_TCS_NEW_FILES : (ReferencedFileList, "newFiles" ), } """ @@ -821,9 +871,6 @@ elif not self.oldFlavor and self.newFlavor: rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) - for (id, path, version) in self.getNewFileList(): - rc.append("+%s %s %s\n" % (id, path, version.asString())) - for (id, path, version) in self.getChangedFileList(): rc.append("~%s " % id) if path: @@ -840,7 +887,7 @@ rc = "".join(rc) final = struct.pack("!I", len(rc)) + rc + \ - streams.StreamSet.freeze(self) + streams.LargeStreamSet.freeze(self) return final @@ -863,7 +910,7 @@ return self.newFlavor def __init__(self, data = None): - streams.StreamSet.__init__(self, data) + streams.LargeStreamSet.__init__(self, data) class TroveChangeSet(AbstractTroveChangeSet): @@ -878,13 +925,11 @@ self.newVersion.set(newVersion) if changeLog: self.changeLog = changeLog - self.newFiles = [] self.changedFiles = [] if absolute: self.tcsType.set(_TCS_TYPE_ABSOLUTE) else: self.tcsType.set(_TCS_TYPE_RELATIVE) - self.packages = ReferencedTroveSet() self.provides.set(None) self.requires.set(None) self.oldFlavor = oldFlavor @@ -947,7 +992,6 @@ del lines[i] break - self.newFiles = [] self.changedFiles = [] self.oldFlavor = oldFlavor self.newFlavor = newFlavor From ewt@specifixinc.com Mon Aug 9 14:19:01 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79IJ0bI030221 for ; Mon, 9 Aug 2004 14:19:01 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id DD01A16745 for ; Mon, 9 Aug 2004 11:19:31 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79IJQTD005078; Mon, 9 Aug 2004 14:19:26 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79IJQbb005075; Mon, 9 Aug 2004 14:19:26 -0400 Date: Mon, 9 Aug 2004 14:19:26 -0400 From: ewt@specifixinc.com Message-Id: <200408091819.i79IJQbb005075@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.146,1.147 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 18:19:01 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv5057 Modified Files: trove.py Log Message: converted changed file list to a stream Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- trove.py 9 Aug 2004 18:02:06 -0000 1.146 +++ trove.py 9 Aug 2004 18:19:24 -0000 1.147 @@ -649,16 +649,17 @@ if data is not None: self.thaw(data) -_STREAM_TCS_NAME = streams._STREAM_TROVE_CHANGE_SET + 0 -_STREAM_TCS_OLD_VERSION = streams._STREAM_TROVE_CHANGE_SET + 1 -_STREAM_TCS_NEW_VERSION = streams._STREAM_TROVE_CHANGE_SET + 2 -_STREAM_TCS_REQUIRES = streams._STREAM_TROVE_CHANGE_SET + 3 -_STREAM_TCS_PROVIDES = streams._STREAM_TROVE_CHANGE_SET + 4 -_STREAM_TCS_CHANGE_LOG = streams._STREAM_TROVE_CHANGE_SET + 5 -_STREAM_TCS_OLD_FILES = streams._STREAM_TROVE_CHANGE_SET + 6 -_STREAM_TCS_TYPE = streams._STREAM_TROVE_CHANGE_SET + 7 -_STREAM_TCS_TROVE_CHANGES = streams._STREAM_TROVE_CHANGE_SET + 8 -_STREAM_TCS_NEW_FILES = streams._STREAM_TROVE_CHANGE_SET + 9 +_STREAM_TCS_NAME = streams._STREAM_TROVE_CHANGE_SET + 0 +_STREAM_TCS_OLD_VERSION = streams._STREAM_TROVE_CHANGE_SET + 1 +_STREAM_TCS_NEW_VERSION = streams._STREAM_TROVE_CHANGE_SET + 2 +_STREAM_TCS_REQUIRES = streams._STREAM_TROVE_CHANGE_SET + 3 +_STREAM_TCS_PROVIDES = streams._STREAM_TROVE_CHANGE_SET + 4 +_STREAM_TCS_CHANGE_LOG = streams._STREAM_TROVE_CHANGE_SET + 5 +_STREAM_TCS_OLD_FILES = streams._STREAM_TROVE_CHANGE_SET + 6 +_STREAM_TCS_TYPE = streams._STREAM_TROVE_CHANGE_SET + 7 +_STREAM_TCS_TROVE_CHANGES = streams._STREAM_TROVE_CHANGE_SET + 8 +_STREAM_TCS_NEW_FILES = streams._STREAM_TROVE_CHANGE_SET + 9 +_STREAM_TCS_CHG_FILES = streams._STREAM_TROVE_CHANGE_SET + 10 _TCS_TYPE_ABSOLUTE = 1 _TCS_TYPE_RELATIVE = 2 @@ -666,16 +667,17 @@ class AbstractTroveChangeSet(streams.LargeStreamSet): streamDict = { - _STREAM_TCS_NAME : (streams.StringStream, "name"), - _STREAM_TCS_OLD_VERSION : (streams.FrozenVersionStream, "oldVersion" ), - _STREAM_TCS_NEW_VERSION : (streams.FrozenVersionStream, "newVersion" ), - _STREAM_TCS_REQUIRES : (streams.DependenciesStream, "requires" ), - _STREAM_TCS_PROVIDES : (streams.DependenciesStream, "provides" ), - _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog, "changeLog" ), - _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), - _STREAM_TCS_TYPE : (streams.IntStream, "tcsType" ), - _STREAM_TCS_TROVE_CHANGES:(ReferencedTroveSet, "packages" ), - _STREAM_TCS_NEW_FILES : (ReferencedFileList, "newFiles" ), + _STREAM_TCS_NAME : (streams.StringStream, "name"), + _STREAM_TCS_OLD_VERSION : (streams.FrozenVersionStream,"oldVersion" ), + _STREAM_TCS_NEW_VERSION : (streams.FrozenVersionStream,"newVersion" ), + _STREAM_TCS_REQUIRES : (streams.DependenciesStream, "requires" ), + _STREAM_TCS_PROVIDES : (streams.DependenciesStream, "provides" ), + _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog,"changeLog" ), + _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), + _STREAM_TCS_TYPE : (streams.IntStream, "tcsType" ), + _STREAM_TCS_TROVE_CHANGES:(ReferencedTroveSet, "packages" ), + _STREAM_TCS_NEW_FILES : (ReferencedFileList, "newFiles" ), + _STREAM_TCS_CHG_FILES : (ReferencedFileList, "changedFiles" ), } """ @@ -871,18 +873,6 @@ elif not self.oldFlavor and self.newFlavor: rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) - for (id, path, version) in self.getChangedFileList(): - rc.append("~%s " % id) - if path: - rc.append(path) - else: - rc.append("-") - - if version: - rc.append(" " + version.asString() + "\n") - else: - rc.append(" -\n") - newStyle = "" rc = "".join(rc) @@ -925,7 +915,6 @@ self.newVersion.set(newVersion) if changeLog: self.changeLog = changeLog - self.changedFiles = [] if absolute: self.tcsType.set(_TCS_TYPE_ABSOLUTE) else: @@ -940,25 +929,7 @@ def parse(self, line): action = line[0] - if action == "+" or action == "~": - fields = line[1:].split() - fileId = fields.pop(0) - version = fields.pop(-1) - path = " ".join(fields) - - if version == "-": - version = None - else: - version = versions.VersionFromString(version) - - if path == "-": - path = None - - if action == "+": - self.newFile(fileId, path, version) - else: - self.changedFile(fileId, path, version) - elif action == "-": + if action == "-": self.oldFile(line[1:]) # this makes our order match the order in the changeset @@ -992,7 +963,6 @@ del lines[i] break - self.changedFiles = [] self.oldFlavor = oldFlavor self.newFlavor = newFlavor From ewt@specifixinc.com Mon Aug 9 15:05:51 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79J5pbI030376 for ; Mon, 9 Aug 2004 15:05:51 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 32D74162A1 for ; Mon, 9 Aug 2004 12:06:22 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79J6KTD007078; Mon, 9 Aug 2004 15:06:20 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79J6KAW007075; Mon, 9 Aug 2004 15:06:20 -0400 Date: Mon, 9 Aug 2004 15:06:20 -0400 From: ewt@specifixinc.com Message-Id: <200408091906.i79J6KAW007075@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.147,1.148 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 19:05:51 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv7063 Modified Files: trove.py Log Message: killed off the last vestiges of line-oriented change sets Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- trove.py 9 Aug 2004 18:19:24 -0000 1.147 +++ trove.py 9 Aug 2004 19:06:18 -0000 1.148 @@ -660,6 +660,8 @@ _STREAM_TCS_TROVE_CHANGES = streams._STREAM_TROVE_CHANGE_SET + 8 _STREAM_TCS_NEW_FILES = streams._STREAM_TROVE_CHANGE_SET + 9 _STREAM_TCS_CHG_FILES = streams._STREAM_TROVE_CHANGE_SET + 10 +_STREAM_TCS_OLD_FLAVOR = streams._STREAM_TROVE_CHANGE_SET + 11 +_STREAM_TCS_NEW_FLAVOR = streams._STREAM_TROVE_CHANGE_SET + 12 _TCS_TYPE_ABSOLUTE = 1 _TCS_TYPE_RELATIVE = 2 @@ -667,17 +669,19 @@ class AbstractTroveChangeSet(streams.LargeStreamSet): streamDict = { - _STREAM_TCS_NAME : (streams.StringStream, "name"), - _STREAM_TCS_OLD_VERSION : (streams.FrozenVersionStream,"oldVersion" ), - _STREAM_TCS_NEW_VERSION : (streams.FrozenVersionStream,"newVersion" ), - _STREAM_TCS_REQUIRES : (streams.DependenciesStream, "requires" ), - _STREAM_TCS_PROVIDES : (streams.DependenciesStream, "provides" ), - _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog,"changeLog" ), - _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), - _STREAM_TCS_TYPE : (streams.IntStream, "tcsType" ), - _STREAM_TCS_TROVE_CHANGES:(ReferencedTroveSet, "packages" ), - _STREAM_TCS_NEW_FILES : (ReferencedFileList, "newFiles" ), - _STREAM_TCS_CHG_FILES : (ReferencedFileList, "changedFiles" ), + _STREAM_TCS_NAME : (streams.StringStream, "name" ), + _STREAM_TCS_OLD_VERSION : (streams.FrozenVersionStream,"oldVersion" ), + _STREAM_TCS_NEW_VERSION : (streams.FrozenVersionStream,"newVersion" ), + _STREAM_TCS_REQUIRES : (streams.DependenciesStream, "requires" ), + _STREAM_TCS_PROVIDES : (streams.DependenciesStream, "provides" ), + _STREAM_TCS_CHANGE_LOG : (changelog.AbstractChangeLog,"changeLog" ), + _STREAM_TCS_OLD_FILES : (streams.StringsStream, "oldFiles" ), + _STREAM_TCS_TYPE : (streams.IntStream, "tcsType" ), + _STREAM_TCS_TROVE_CHANGES:(ReferencedTroveSet, "packages" ), + _STREAM_TCS_NEW_FILES : (ReferencedFileList, "newFiles" ), + _STREAM_TCS_CHG_FILES : (ReferencedFileList, "changedFiles"), + _STREAM_TCS_OLD_FLAVOR : (streams.DependenciesStream, "oldFlavor" ), + _STREAM_TCS_NEW_FLAVOR : (streams.DependenciesStream, "newFlavor" ), } """ @@ -804,10 +808,10 @@ depformat('Requires', self.getRequires(), f) if self.getProvides(): depformat('Provides', self.getProvides(), f) - if self.oldFlavor: - depformat('Old Flavor', self.oldFlavor, f) - if self.newFlavor: - depformat('New Flavor', self.newFlavor, f) + if self.getOldFlavor(): + depformat('Old Flavor', self.getOldFlavor(), f) + if self.getNewFlavor(): + depformat('New Flavor', self.getNewFlavor(), f) for (fileId, path, version) in self.newFiles: #f.write("\tadded (%s(.*)%s)\n" % (fileId[:6], fileId[-6:])) @@ -840,47 +844,6 @@ list = [ x[0] + x[1].asString() for x in self.packages[name] ] f.write("\t" + name + " " + " ".join(list) + "\n") - def freeze(self): - """ - Returns a string representation of this change set which can - later be parsed by parse(). The representation begins with a - header:: - - AwBS || - CS || - NEW - [REQUIRES ] - [PROVIDES ] - [FLAVOR ] - [CL - ] - - The remainder of the lines, each specifies a new file, old file, - removed file, or a change to the set of included packages. Each of - these lines begins with a "+", "-", "~", or "p" respectively. - - @rtype: string - """ - - rc = [] - lines = 0 - - if self.oldFlavor and self.newFlavor: - rc.append("FLAVOR %s %s\n" % (self.oldFlavor.freeze(), - self.newFlavor.freeze())) - elif self.oldFlavor and not self.newFlavor: - rc.append("FLAVOR %s -\n" % (self.oldFlavor.freeze())) - elif not self.oldFlavor and self.newFlavor: - rc.append("FLAVOR - %s\n" % (self.newFlavor.freeze())) - - newStyle = "" - rc = "".join(rc) - - final = struct.pack("!I", len(rc)) + rc + \ - streams.LargeStreamSet.freeze(self) - - return final - def setProvides(self, provides): self.provides.set(provides) @@ -894,10 +857,10 @@ return self.requires.value() def getOldFlavor(self): - return self.oldFlavor + return self.oldFlavor.value() def getNewFlavor(self): - return self.newFlavor + return self.newFlavor.value() def __init__(self, data = None): streams.LargeStreamSet.__init__(self, data) @@ -921,53 +884,20 @@ self.tcsType.set(_TCS_TYPE_RELATIVE) self.provides.set(None) self.requires.set(None) - self.oldFlavor = oldFlavor - self.newFlavor = newFlavor + self.oldFlavor.set(oldFlavor) + self.newFlavor.set(newFlavor) class ThawTroveChangeSet(AbstractTroveChangeSet): - def parse(self, line): - action = line[0] + def __init__(self, buf): + AbstractTroveChangeSet.__init__(self, buf) - if action == "-": - self.oldFile(line[1:]) + # empty flabors should be none, not empty DependencySet Classes + if not self.oldFlavor.value().getDepClasses(): + self.oldFlavor.set(None) - # this makes our order match the order in the changeset - self.changedFiles.sort() - - def __init__(self, buf): - oldSize = struct.unpack("!I", buf[0:4])[0] - newStyle = buf[oldSize + 4:] - buf = buf[4:oldSize + 4] - - AbstractTroveChangeSet.__init__(self, newStyle) - - lines = buf.split("\n")[:-1] - - oldVersion = None - - # find the flavor - oldFlavor = None - newFlavor = None - for i, l in enumerate(lines): - if l.startswith("FLAVOR "): - lst = l.split(' ', 2) - oldFlavorStr, newFlavorStr = lst[1:3] - - if oldFlavorStr != "-": - oldFlavor = deps.ThawDependencySet(oldFlavorStr) - - if newFlavorStr != "-": - newFlavor = deps.ThawDependencySet(newFlavorStr) - - del lines[i] - break - - self.oldFlavor = oldFlavor - self.newFlavor = newFlavor - - for line in lines: - self.parse(line) + if not self.newFlavor.value().getDepClasses(): + self.newFlavor.set(None) class TroveError(Exception): From msw@specifixinc.com Mon Aug 9 15:58:14 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79JwEbI030624 for ; Mon, 9 Aug 2004 15:58:14 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 88F2C16212 for ; Mon, 9 Aug 2004 12:58:45 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79JwhTD009170; Mon, 9 Aug 2004 15:58:43 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79JwhOm009167; Mon, 9 Aug 2004 15:58:43 -0400 Date: Mon, 9 Aug 2004 15:58:43 -0400 From: Matt Wilson Message-Id: <200408091958.i79JwhOm009167@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build packagepolicy.py,1.117.2.1,1.117.2.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 19:58:14 -0000 Update of /mnt/specifix/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv9155 Modified Files: Tag: conary-0_6_4-branch packagepolicy.py Log Message: updateArgs is in policy.Policy Index: packagepolicy.py =================================================================== RCS file: /mnt/specifix/cvs/conary/build/packagepolicy.py,v retrieving revision 1.117.2.1 retrieving revision 1.117.2.2 diff -u -r1.117.2.1 -r1.117.2.2 --- packagepolicy.py 9 Aug 2004 15:35:10 -0000 1.117.2.1 +++ packagepolicy.py 9 Aug 2004 19:58:41 -0000 1.117.2.2 @@ -382,7 +382,7 @@ # needs to share with ExecutableLibraries def updateArgs(self, *args, **keywords): - policy.updateArgs(self, *args, **keywords) + policy.Policy.updateArgs(self, *args, **keywords) self.recipe.ExecutableLibraries(*args, **keywords) def doFile(self, file): From ewt@specifixinc.com Mon Aug 9 16:00:36 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K0ZbI030638 for ; Mon, 9 Aug 2004 16:00:35 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id F35A916212 for ; Mon, 9 Aug 2004 13:01:06 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K15TD009555; Mon, 9 Aug 2004 16:01:05 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79K15g5009551; Mon, 9 Aug 2004 16:01:05 -0400 Date: Mon, 9 Aug 2004 16:01:05 -0400 From: ewt@specifixinc.com Message-Id: <200408092001.i79K15g5009551@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.145,1.146 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:00:36 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv9465/repository Modified Files: changeset.py Log Message: began moving changesets to infostreams Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- changeset.py 6 Aug 2004 17:21:46 -0000 1.145 +++ changeset.py 9 Aug 2004 20:01:03 -0000 1.146 @@ -64,7 +64,13 @@ def setCsInfo(self, value): return self.items[3].set(value) -class ChangeSet: +_STREAM_CS_PRIMARY = 1 + +class ChangeSet(streams.LargeStreamSet): + + streamDict = { + _STREAM_CS_PRIMARY :(streams.ReferencedTroveList, "primaryTroveList" ), + } def isAbsolute(self): return self.absolute @@ -106,10 +112,10 @@ assert(not self.files.has_key(fileId)) def addPrimaryPackage(self, name, version, flavor): - self.primaryPackageList.append((name, version, flavor)) + self.primaryTroveList.append((name, version, flavor)) def getPrimaryPackageList(self): - return self.primaryPackageList + return self.primaryTroveList def newPackage(self, csPkg): old = csPkg.getOldVersion() @@ -181,7 +187,7 @@ def formatToFile(self, cfg, f): f.write("primary packages:\n") - for (pkgName, version, flavor) in self.primaryPackageList: + for (pkgName, version, flavor) in self.primaryTroveList: if flavor: f.write("\t%s %s %s\n" % (pkgName, version.asString(), flavor.freeze())) @@ -205,18 +211,10 @@ return self.files.has_key(fileId) def headerAsString(self): + start = self.freeze() + rc = [] - primaries = [ ] - for (name, version, flavor) in self.primaryPackageList: - primaries.append(name) - primaries.append(version.asString()) - if flavor: - primaries.append(flavor.freeze()) - else: - primaries.append("") - primaries = "\0".join(primaries) - for pkg in self.iterNewPackageList(): s = pkg.freeze() rc.append("PKG %d\n" % len(s)) @@ -244,8 +242,8 @@ fileList[0] = "FILES %d\n" % totalLen - return "PRIMARIES %d\n%s%s%s" % \ - (len(primaries), primaries, + return "%s%s%s%s" % \ + (struct.pack("!I", len(start)), start, "".join(rc), "".join(fileList)) @@ -526,7 +524,8 @@ # this has to be true, I think... self.local = 0 - def __init__(self): + def __init__(self, data = None): + streams.LargeStreamSet.__init__(self, data) self.newPackages = {} self.oldPackages = [] self.files = {} @@ -584,7 +583,16 @@ def hasFileContents(self, hash): return self.csf.hasFile(hash) - def read(self, file): + def writeAllContents(self, csf): + rc = self.csf.getNextFile() + while rc is not None: + (fileId, tag, f, size) = rc + cont = filecontents.FromFile(f, size) + csf.addFile(fileId, cont, tag) + + rc = self.csf.getNextFile() + + def __init__(self, file, justContentsForConfig = 0, skipValidate = 1): f = open(file, "r") self.csf = filecontainer.FileContainer(f) f.close() @@ -592,6 +600,11 @@ (tagInfo, control, size) = self.csf.getFile("CONARYCHANGESET") + startSize = control.read(4) + startSize = struct.unpack("!I", startSize)[0] + start = control.read(startSize) + ChangeSet.__init__(self, data = start) + line = control.readline() while line: header = line[:-1] @@ -655,21 +668,11 @@ line = control.readline() - def writeAllContents(self, csf): - rc = self.csf.getNextFile() - while rc is not None: - (fileId, tag, f, size) = rc - cont = filecontents.FromFile(f, size) - csf.addFile(fileId, cont, tag) - - rc = self.csf.getNextFile() - def __init__(self, file, justContentsForConfig = 0, skipValidate = 1): - ChangeSet.__init__(self) self.configCache = {} self.earlyFileContents = None self.lateFileContents = None - self.read(file) + if not skipValidate: self.validate(justContentsForConfig) From ewt@specifixinc.com Mon Aug 9 16:00:36 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K0ZbI030639 for ; Mon, 9 Aug 2004 16:00:35 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3DD1C1675B for ; Mon, 9 Aug 2004 13:01:07 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K15TD009554; Mon, 9 Aug 2004 16:01:05 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79K15B0009547; Mon, 9 Aug 2004 16:01:05 -0400 Date: Mon, 9 Aug 2004 16:01:05 -0400 From: ewt@specifixinc.com Message-Id: <200408092001.i79K15B0009547@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.13,1.14 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:00:36 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv9465 Modified Files: streams.py Log Message: began moving changesets to infostreams Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- streams.py 9 Aug 2004 18:01:59 -0000 1.13 +++ streams.py 9 Aug 2004 20:01:03 -0000 1.14 @@ -491,7 +491,49 @@ return conflicts +class ReferencedTroveList(list, InfoStream): + + def freeze(self): + l = [] + for (name, version, flavor) in self: + version = version.freeze() + if flavor: + flavor = flavor.freeze() + else: + flavor = "" + + l.append(name) + l.append(version) + l.append(flavor) + + return "\0".join(l) + + def thaw(self, data): + del self[:] + if not data: return + + l = data.split("\0") + i = 0 + + while i < len(l): + name = l[i] + version = versions.ThawVersion(l[i + 1]) + flavor = l[i + 2] + + if not flavor: + flavor = None + else: + flavor = deps.ThawDependencySet(flavor) + + self.append((name, version, flavor)) + i += 3 + + def __init__(self, data = None): + list.__init__(self) + if data is not None: + self.thaw(data) + class LargeStreamSet(StreamSet): - headerFormat = "!BI" - headerSize = 5 + headerFormat = "!HI" + headerSize = 6 From msw@specifixinc.com Mon Aug 9 16:01:32 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K1VbI030661 for ; Mon, 9 Aug 2004 16:01:32 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 315C516212 for ; Mon, 9 Aug 2004 13:02:03 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K21TD009733; Mon, 9 Aug 2004 16:02:01 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79K21ik009730; Mon, 9 Aug 2004 16:02:01 -0400 Date: Mon, 9 Aug 2004 16:02:01 -0400 From: Matt Wilson Message-Id: <200408092002.i79K21ik009730@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary Makefile,1.71.2.1,1.71.2.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:01:32 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv9693 Modified Files: Tag: conary-0_6_4-branch Makefile Log Message: 0.6.6 Index: Makefile =================================================================== RCS file: /mnt/specifix/cvs/conary/Makefile,v retrieving revision 1.71.2.1 retrieving revision 1.71.2.2 diff -u -r1.71.2.1 -r1.71.2.2 --- Makefile 9 Aug 2004 14:46:27 -0000 1.71.2.1 +++ Makefile 9 Aug 2004 20:01:59 -0000 1.71.2.2 @@ -14,7 +14,7 @@ all: subdirs conary-wrapper -export VERSION = 0.6.5 +export VERSION = 0.6.6 export TOPDIR = $(shell pwd) export DISTDIR = $(TOPDIR)/conary-$(VERSION) export prefix = /usr From dbc@specifixinc.com Mon Aug 9 16:08:54 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K8rbI030731 for ; Mon, 9 Aug 2004 16:08:54 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 3FAD416212 for ; Mon, 9 Aug 2004 13:09:25 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79K9NTD010138; Mon, 9 Aug 2004 16:09:23 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79K9N8Z010134; Mon, 9 Aug 2004 16:09:23 -0400 Date: Mon, 9 Aug 2004 16:09:23 -0400 From: David Christian Message-Id: <200408092009.i79K9N8Z010134@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build action.py,1.11,1.12 build.py,1.177,1.178 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:08:54 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv10113 Modified Files: action.py build.py Log Message: keywork that allows the debugging the execution of a build action Index: action.py =================================================================== RCS file: /cvs/conary/build/action.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- action.py 6 Aug 2004 17:30:34 -0000 1.11 +++ action.py 9 Aug 2004 20:09:21 -0000 1.12 @@ -50,6 +50,8 @@ @cvar keywords: The keywords and default values accepted by the class """ + keywords = { 'debug' : False } + def __init__(self, *args, **keywords): assert(self.__class__ is not Action) # keywords will be in the class object, not the instance @@ -64,6 +66,9 @@ arg % d def doAction(self): + if self.debug: + import pdb + pdb.set_trace() self.do() def do(self): @@ -148,6 +153,9 @@ # virtual method for actually executing the action def doAction(self): global actionobject + if self.debug: + import pdb + pdb.set_trace() if self.use: if self.linenum is None: self.do() Index: build.py =================================================================== RCS file: /cvs/conary/build/build.py,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- build.py 6 Aug 2004 17:30:34 -0000 1.177 +++ build.py 9 Aug 2004 20:09:21 -0000 1.178 @@ -62,6 +62,9 @@ action.RecipeAction.__init__(self, recipe, *args, **keywords) def doAction(self): + if self.debug: + import pdb + pdb.set_trace() if self.use: if self.linenum is None: self.do(self.recipe.macros) From ewt@specifixinc.com Mon Aug 9 16:15:36 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KFabI030751 for ; Mon, 9 Aug 2004 16:15:36 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id B9B6D16212 for ; Mon, 9 Aug 2004 13:16:07 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KG6TD010452; Mon, 9 Aug 2004 16:16:06 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79KG60U010449; Mon, 9 Aug 2004 16:16:06 -0400 Date: Mon, 9 Aug 2004 16:16:06 -0400 From: ewt@specifixinc.com Message-Id: <200408092016.i79KG60U010449@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.146,1.147 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:15:36 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv10415/repository Modified Files: changeset.py Log Message: switched change set new package list to a stream Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- changeset.py 9 Aug 2004 20:01:03 -0000 1.146 +++ changeset.py 9 Aug 2004 20:16:03 -0000 1.147 @@ -64,12 +64,42 @@ def setCsInfo(self, value): return self.items[3].set(value) +class ChangeSetNewPackageList(dict, streams.InfoStream): + + def freeze(self): + l = [] + for pkg in self.itervalues(): + s = pkg.freeze() + l.append(struct.pack("!I", len(s))) + l.append(s) + + return "".join(l) + + def thaw(self, data): + i = 0 + while i < len(data): + size = struct.unpack("!I", data[i : i + 4])[0] + i += 4 + s = data[i: i + size] + i += size + trvCs = trove.ThawTroveChangeSet(s) + + self[(trvCs.getName(), trvCs.getNewVersion(), + trvCs.getNewFlavor())] = trvCs + + def __init__(self, data = None): + if data: + self.thaw(data) + + _STREAM_CS_PRIMARY = 1 +_STREAM_CS_PKGS = 2 class ChangeSet(streams.LargeStreamSet): streamDict = { - _STREAM_CS_PRIMARY :(streams.ReferencedTroveList, "primaryTroveList" ), + _STREAM_CS_PRIMARY :(streams.ReferencedTroveList, "primaryTroveList" ), + _STREAM_CS_PKGS :(ChangeSetNewPackageList, "newPackages" ), } def isAbsolute(self): @@ -526,7 +556,6 @@ def __init__(self, data = None): streams.LargeStreamSet.__init__(self, data) - self.newPackages = {} self.oldPackages = [] self.files = {} self.earlyFileContents = {} @@ -605,6 +634,16 @@ start = control.read(startSize) ChangeSet.__init__(self, data = start) + for trvCs in self.newPackages.itervalues(): + if trvCs.isAbsolute(): + self.absolute = 1 + + old = trvCs.getOldVersion() + new = trvCs.getNewVersion() + + if (old and old.isLocal()) or new.isLocal(): + self.local = 1 + line = control.readline() while line: header = line[:-1] From msw@specifixinc.com Mon Aug 9 16:16:08 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KG8bI030759 for ; Mon, 9 Aug 2004 16:16:08 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id A382516212 for ; Mon, 9 Aug 2004 13:16:39 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KGbTD010493; Mon, 9 Aug 2004 16:16:37 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79KGbRK010490; Mon, 9 Aug 2004 16:16:37 -0400 Date: Mon, 9 Aug 2004 16:16:37 -0400 From: Matt Wilson Message-Id: <200408092016.i79KGbRK010490@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary checkin.py,1.125,1.125.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:16:08 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv10440 Modified Files: Tag: conary-0_6_4-branch checkin.py Log Message: 1) call repos.findTrove() with the correct number of arguments 2) print a better error message when a trove cannot be found Index: checkin.py =================================================================== RCS file: /mnt/specifix/cvs/conary/checkin.py,v retrieving revision 1.125 retrieving revision 1.125.2.1 diff -u -r1.125 -r1.125.2.1 --- checkin.py 5 Aug 2004 21:53:19 -0000 1.125 +++ checkin.py 9 Aug 2004 20:16:35 -0000 1.125.2.1 @@ -338,8 +338,14 @@ if versionStr: versionStr = state.expandVersionStr(versionStr) - pkgList = repos.findTrove(None, state.getName(), None, None, - versionStr = versionStr) + try: + pkgList = repos.findTrove(None, state.getName(), None, + versionStr = versionStr) + except repository.repository.PackageNotFound, e: + log.error("Unable to find source component %s with version %s: %s", + state.getName(), versionStr, str(e)) + return + if len(pkgList) > 1: log.error("%s specifies multiple versions" % versionStr) return From msw@specifixinc.com Mon Aug 9 16:16:43 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KGgbI030767 for ; Mon, 9 Aug 2004 16:16:42 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id DCF3816212 for ; Mon, 9 Aug 2004 13:17:13 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KHCTD010625; Mon, 9 Aug 2004 16:17:12 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79KHCAg010622; Mon, 9 Aug 2004 16:17:12 -0400 Date: Mon, 9 Aug 2004 16:17:12 -0400 From: Matt Wilson Message-Id: <200408092017.i79KHCAg010622@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary checkin.py,1.129,1.130 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:16:43 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv10603 Modified Files: checkin.py Log Message: 1) call repos.findTrove() with the correct number of arguments 2) print a better error message when a trove cannot be found Index: checkin.py =================================================================== RCS file: /mnt/specifix/cvs/conary/checkin.py,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- checkin.py 8 Aug 2004 03:14:33 -0000 1.129 +++ checkin.py 9 Aug 2004 20:17:10 -0000 1.130 @@ -338,8 +338,14 @@ if versionStr: versionStr = state.expandVersionStr(versionStr) - pkgList = repos.findTrove(None, state.getName(), None, None, - versionStr = versionStr) + try: + pkgList = repos.findTrove(None, state.getName(), None, + versionStr = versionStr) + except repository.repository.PackageNotFound, e: + log.error("Unable to find source component %s with version %s: %s", + state.getName(), versionStr, str(e)) + return + if len(pkgList) > 1: log.error("%s specifies multiple versions" % versionStr) return From msw@specifixinc.com Mon Aug 9 16:27:12 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KRBbI030793 for ; Mon, 9 Aug 2004 16:27:11 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 1D5D116212 for ; Mon, 9 Aug 2004 13:27:43 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KRbTD011199; Mon, 9 Aug 2004 16:27:37 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79KRbXr011196; Mon, 9 Aug 2004 16:27:37 -0400 Date: Mon, 9 Aug 2004 16:27:37 -0400 From: Matt Wilson Message-Id: <200408092027.i79KRbXr011196@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build packagepolicy.py,1.119,1.120 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:27:12 -0000 Update of /mnt/specifix/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv11184 Modified Files: packagepolicy.py Log Message: updateArgs is in policy.Policy Index: packagepolicy.py =================================================================== RCS file: /mnt/specifix/cvs/conary/build/packagepolicy.py,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- packagepolicy.py 9 Aug 2004 15:36:34 -0000 1.119 +++ packagepolicy.py 9 Aug 2004 20:27:35 -0000 1.120 @@ -387,7 +387,7 @@ # needs to share with ExecutableLibraries and CheckSonames def updateArgs(self, *args, **keywords): - policy.updateArgs(self, *args, **keywords) + policy.Policy.updateArgs(self, *args, **keywords) self.recipe.ExecutableLibraries(*args, **keywords) self.recipe.CheckSonames(*args, **keywords) From ewt@specifixinc.com Mon Aug 9 16:27:47 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KRlbI030801 for ; Mon, 9 Aug 2004 16:27:47 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 6FC4216212 for ; Mon, 9 Aug 2004 13:28:18 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KSGTD011291; Mon, 9 Aug 2004 16:28:16 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79KSG8v011288; Mon, 9 Aug 2004 16:28:16 -0400 Date: Mon, 9 Aug 2004 16:28:16 -0400 From: ewt@specifixinc.com Message-Id: <200408092028.i79KSG8v011288@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.147,1.148 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:27:47 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv11273/repository Modified Files: changeset.py Log Message: switched old file list to a stream Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- changeset.py 9 Aug 2004 20:16:03 -0000 1.147 +++ changeset.py 9 Aug 2004 20:28:14 -0000 1.148 @@ -92,14 +92,16 @@ self.thaw(data) -_STREAM_CS_PRIMARY = 1 -_STREAM_CS_PKGS = 2 +_STREAM_CS_PRIMARY = 1 +_STREAM_CS_PKGS = 2 +_STREAM_CS_OLD_PKGS = 3 class ChangeSet(streams.LargeStreamSet): streamDict = { _STREAM_CS_PRIMARY :(streams.ReferencedTroveList, "primaryTroveList" ), _STREAM_CS_PKGS :(ChangeSetNewPackageList, "newPackages" ), + _STREAM_CS_OLD_PKGS:(streams.ReferencedTroveList, "oldPackages" ), } def isAbsolute(self): @@ -245,19 +247,6 @@ rc = [] - for pkg in self.iterNewPackageList(): - s = pkg.freeze() - rc.append("PKG %d\n" % len(s)) - rc.append(s) - - for (pkgName, version, flavor) in self.getOldPackageList(): - if flavor: - rc.append("PKG RMVD %s %s %s\n" % - (pkgName, version.freeze(), flavor.freeze())) - else: - rc.append("PKG RMVD %s %s\n" % - (pkgName, version.freeze())) - fileList = [ None,] totalLen = 0 for (fileId, (oldVersion, newVersion, csInfo)) in self.files.iteritems(): @@ -556,7 +545,6 @@ def __init__(self, data = None): streams.LargeStreamSet.__init__(self, data) - self.oldPackages = [] self.files = {} self.earlyFileContents = {} self.lateFileContents = {} @@ -648,40 +636,7 @@ while line: header = line[:-1] - if header.startswith("PRIMARIES "): - size = int(header.split()[1]) - if size: - buf = control.read(size) - items = buf.split("\0") - - assert(len(items) % 3 == 0) - i = 0 - while i < len(items): - name = items[i] - version = items[i + 1] - flavor = items[i + 2] - i += 3 - version = versions.VersionFromString(version) - if flavor: - flavor = deps.ThawDependencySet(flavor) - else: - flavor = None - self.primaryPackageList.append((name, version, flavor)) - elif header.startswith("PKG RMVD "): - fields = header.split() - (pkgName, verStr) = fields[2:4] - version = versions.ThawVersion(verStr) - if len(fields) == 5: - flavor = deps.ThawDependencySet(fields[4]) - else: - flavor = None - self.oldPackage(pkgName, version, flavor) - elif header.startswith("PKG "): - size = int(header.split()[1]) - buf = control.read(size) - pkg = trove.ThawTroveChangeSet(buf) - self.newPackage(pkg) - elif header.startswith("FILES "): + if header.startswith("FILES "): size = int(header.split()[1]) buf = control.read(size) From ewt@specifixinc.com Mon Aug 9 16:53:55 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KrsbI030854 for ; Mon, 9 Aug 2004 16:53:55 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 4195916212 for ; Mon, 9 Aug 2004 13:54:26 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79KsNTD012117; Mon, 9 Aug 2004 16:54:24 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79KsNm0012110; Mon, 9 Aug 2004 16:54:23 -0400 Date: Mon, 9 Aug 2004 16:54:23 -0400 From: ewt@specifixinc.com Message-Id: <200408092054.i79KsNm0012110@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.148,1.149 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 20:53:55 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv12092/repository Modified Files: changeset.py Log Message: removed the last of the line oriented mess Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- changeset.py 9 Aug 2004 20:28:14 -0000 1.148 +++ changeset.py 9 Aug 2004 20:54:21 -0000 1.149 @@ -91,10 +91,47 @@ if data: self.thaw(data) +class ChangeSetFileDict(dict, streams.InfoStream): + + def freeze(self): + fileList = [] + for (fileId, (oldVersion, newVersion, csInfo)) in self.iteritems(): + if oldVersion: + oldStr = oldVersion.asString() + else: + oldStr = "" + + s = FileInfo(fileId, oldStr, newVersion.asString(), csInfo).freeze() + fileList.append(struct.pack("!I", len(s)) + s) + + return "".join(fileList) + + def thaw(self ,data): + i = 0 + while i < len(data): + size = struct.unpack("!I", data[i:i+4])[0] + i += 4 + info = FileInfo(data[i:i+size]) + i += size + + oldVerStr = info.oldVersion() + + if not oldVerStr: + oldVersion = None + else: + oldVersion = versions.VersionFromString(oldVerStr) + + newVersion = versions.VersionFromString(info.newVersion()) + self[info.fileId()] = (oldVersion, newVersion, info.csInfo()) + + def __init__(self, data = None): + if data: + self.thaw(data) _STREAM_CS_PRIMARY = 1 _STREAM_CS_PKGS = 2 _STREAM_CS_OLD_PKGS = 3 +_STREAM_CS_FILES = 4 class ChangeSet(streams.LargeStreamSet): @@ -102,6 +139,7 @@ _STREAM_CS_PRIMARY :(streams.ReferencedTroveList, "primaryTroveList" ), _STREAM_CS_PKGS :(ChangeSetNewPackageList, "newPackages" ), _STREAM_CS_OLD_PKGS:(streams.ReferencedTroveList, "oldPackages" ), + _STREAM_CS_FILES :(ChangeSetFileDict, "files" ), } def isAbsolute(self): @@ -242,30 +280,6 @@ def hasFileChange(self, fileId): return self.files.has_key(fileId) - def headerAsString(self): - start = self.freeze() - - rc = [] - - fileList = [ None,] - totalLen = 0 - for (fileId, (oldVersion, newVersion, csInfo)) in self.files.iteritems(): - if oldVersion: - oldStr = oldVersion.asString() - else: - oldStr = "(none)" - - s = FileInfo(fileId, oldStr, newVersion.asString(), csInfo).freeze() - fileList.append(struct.pack("!I", len(s)) + s) - totalLen += len(fileList[-1]) - - fileList[0] = "FILES %d\n" % totalLen - - return "%s%s%s%s" % \ - (struct.pack("!I", len(start)), start, - "".join(rc), - "".join(fileList)) - def writeContents(self, csf, contents, early): # these are kept sorted so we know which one comes next idList = contents.keys() @@ -290,7 +304,7 @@ csf = filecontainer.FileContainer(outFile) outFile.close() - str = self.headerAsString() + str = self.freeze() csf.addFile("CONARYCHANGESET", filecontents.FromString(str), "") self.writeAllContents(csf) csf.close() @@ -545,7 +559,6 @@ def __init__(self, data = None): streams.LargeStreamSet.__init__(self, data) - self.files = {} self.earlyFileContents = {} self.lateFileContents = {} self.primaryPackageList = [] @@ -617,9 +630,7 @@ (tagInfo, control, size) = self.csf.getFile("CONARYCHANGESET") - startSize = control.read(4) - startSize = struct.unpack("!I", startSize)[0] - start = control.read(startSize) + start = control.read() ChangeSet.__init__(self, data = start) for trvCs in self.newPackages.itervalues(): @@ -632,37 +643,6 @@ if (old and old.isLocal()) or new.isLocal(): self.local = 1 - line = control.readline() - while line: - header = line[:-1] - - if header.startswith("FILES "): - size = int(header.split()[1]) - - buf = control.read(size) - i = 0 - while i < len(buf): - size = struct.unpack("!I", buf[i:i+4])[0] - i += 4 - info = FileInfo(buf[i:i+size]) - i += size - - oldVerStr = info.oldVersion() - - if oldVerStr == "(none)": - oldVersion = None - else: - oldVersion = versions.VersionFromString(oldVerStr) - newVersion = versions.VersionFromString(info.newVersion()) - self.addFile(info.fileId(), oldVersion, newVersion, - info.csInfo()) - else: - print header - raise IOError, "invalid line in change set %s" % file - - line = control.readline() - - self.configCache = {} self.earlyFileContents = None self.lateFileContents = None From msw@specifixinc.com Mon Aug 9 17:01:59 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79L1xbI030875 for ; Mon, 9 Aug 2004 17:01:59 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 9F49D16212 for ; Mon, 9 Aug 2004 14:02:30 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79L2STD012625; Mon, 9 Aug 2004 17:02:28 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79L2SPL012622; Mon, 9 Aug 2004 17:02:28 -0400 Date: Mon, 9 Aug 2004 17:02:28 -0400 From: Matt Wilson Message-Id: <200408092102.i79L2SPL012622@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build packagepolicy.py,1.120,1.121 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 21:01:59 -0000 Update of /mnt/specifix/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv12604 Modified Files: packagepolicy.py Log Message: disable broken code until it is fixed Index: packagepolicy.py =================================================================== RCS file: /mnt/specifix/cvs/conary/build/packagepolicy.py,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- packagepolicy.py 9 Aug 2004 20:27:35 -0000 1.120 +++ packagepolicy.py 9 Aug 2004 21:02:26 -0000 1.121 @@ -388,8 +388,9 @@ # needs to share with ExecutableLibraries and CheckSonames def updateArgs(self, *args, **keywords): policy.Policy.updateArgs(self, *args, **keywords) - self.recipe.ExecutableLibraries(*args, **keywords) - self.recipe.CheckSonames(*args, **keywords) + # XXX there is no recipe here - only in doProcess context + # self.recipe.ExecutableLibraries(*args, **keywords) + # self.recipe.CheckSonames(*args, **keywords) def doFile(self, file): fullpath = ('%(destdir)s/'+file) %self.macros From ewt@specifixinc.com Mon Aug 9 17:12:23 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79LCNbI030887 for ; Mon, 9 Aug 2004 17:12:23 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 679C316212 for ; Mon, 9 Aug 2004 14:12:54 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79LCqTD012968; Mon, 9 Aug 2004 17:12:52 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79LCqJT012965; Mon, 9 Aug 2004 17:12:52 -0400 Date: Mon, 9 Aug 2004 17:12:52 -0400 From: ewt@specifixinc.com Message-Id: <200408092112.i79LCqJT012965@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary streams.py,1.14,1.15 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 21:12:23 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv12953 Modified Files: streams.py Log Message: added sha1 object; it still keeps the sha1 internally as a string, but that can be fixed Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- streams.py 9 Aug 2004 20:01:03 -0000 1.14 +++ streams.py 9 Aug 2004 21:12:50 -0000 1.15 @@ -177,10 +177,14 @@ class Sha1Stream(StringStream): - # stores the sha1 as a binary, but can present it as a string + def freeze(self): + return struct.pack("!5I", int(self.s[ 0: 8], 16), + int(self.s[ 8:16], 16), int(self.s[16:24], 16), + int(self.s[24:32], 16), int(self.s[32:40], 16)) - def __str__(self): - return "%x%x%x%x%x" % struct.unpack("!5I", self.s) + def thaw(self, data): + if data: + self.s = "%08x%08x%08x%08x%08x" % struct.unpack("!5I", data) class FrozenVersionStream(InfoStream): From ewt@specifixinc.com Mon Aug 9 18:04:09 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79M47bI030942 for ; Mon, 9 Aug 2004 18:04:07 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id BAEB916736 for ; Mon, 9 Aug 2004 15:04:38 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79M4aTD014396; Mon, 9 Aug 2004 18:04:36 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79M4a1G014392; Mon, 9 Aug 2004 18:04:36 -0400 Date: Mon, 9 Aug 2004 18:04:36 -0400 From: ewt@specifixinc.com Message-Id: <200408092204.i79M4a1G014392@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary files.py, 1.159, 1.160 streams.py, 1.15, 1.16 trove.py, 1.148, 1.149 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 22:04:09 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv14366 Modified Files: files.py streams.py trove.py Log Message: switched some fileid's to binary storage Index: files.py =================================================================== RCS file: /cvs/conary/files.py,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- files.py 8 Aug 2004 03:14:33 -0000 1.159 +++ files.py 9 Aug 2004 22:04:34 -0000 1.160 @@ -63,9 +63,8 @@ class RegularFileStream(streams.TupleStream): __slots__ = [] - makeup = (("size", streams.LongLongStream, 8), - ("sha1", streams.StringStream, 40)) + ("sha1", streams.Sha1Stream, 40)) def size(self): return self.items[0].value() @@ -78,6 +77,12 @@ def setSha1(self, value): return self.items[1].set(value) + +class OldRegularFileStream(streams.TupleStream): + + __slots__ = [] + makeup = (("size", streams.LongLongStream, 8), + ("sha1", streams.StringStream, 40)) class InodeStream(streams.TupleStream): @@ -509,7 +514,9 @@ if needsSha1: sha1 = sha1helper.hashFile(path) - f.contents = RegularFileStream(s.st_size, sha1) + f.contents = RegularFileStream() + f.contents.setSize(s.st_size) + f.contents.setSha1(sha1) if buildDeps and f.hasContents and isinstance(f, RegularFile): result = filedeps.findFileDependencies(path) Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- streams.py 9 Aug 2004 21:12:50 -0000 1.15 +++ streams.py 9 Aug 2004 22:04:34 -0000 1.16 @@ -178,12 +178,14 @@ class Sha1Stream(StringStream): def freeze(self): + assert(len(self.s) == 40) return struct.pack("!5I", int(self.s[ 0: 8], 16), int(self.s[ 8:16], 16), int(self.s[16:24], 16), int(self.s[24:32], 16), int(self.s[32:40], 16)) def thaw(self, data): if data: + assert(len(data) == 20) self.s = "%08x%08x%08x%08x%08x" % struct.unpack("!5I", data) class FrozenVersionStream(InfoStream): Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- trove.py 9 Aug 2004 19:06:18 -0000 1.148 +++ trove.py 9 Aug 2004 22:04:34 -0000 1.149 @@ -607,43 +607,59 @@ def freeze(self): l = [] + + # XXX this can go away once we track binary fileids + sha1 = streams.Sha1Stream() + for (fileId, path, version) in self: - l.append(fileId) - if path: - l.append(path) - else: - l.append("") + sha1.set(fileId) + l.append(sha1.freeze()) + if not path: + path = "" + + l.append(struct.pack("!H", len(path))) + l.append(path) if version: - l.append(version.asString()) + version = version.asString() else: - l.append("") + version = "" + + l.append(struct.pack("!H", len(version))) + l.append(version) - return "\0".join(l) + return "".join(l) def thaw(self, data): del self[:] if not data: return - l = data.split("\0") i = 0 - while i < len(l): - fileId = l[i] - if l[i + 1]: - path = l[i + 1] + while i < len(data): + # XXX this can go away once we track binary fileids + sha1 = streams.Sha1Stream(data[i:i+20]) + fileId = sha1.value() + i += 20 + + pathLen = struct.unpack("!H", data[i:i+2])[0] + i += 2 + if pathLen: + path = data[i:i + pathLen] + i += pathLen else: path = None - if l[i + 2]: - version = versions.VersionFromString(l[i + 2]) + versionLen = struct.unpack("!H", data[i:i+2])[0] + i += 2 + if versionLen: + version = versions.VersionFromString(data[i:i + versionLen]) + i += versionLen else: version = None self.append((fileId, path, version)) - i += 3 - def __init__(self, data = None): list.__init__(self) if data is not None: From johnsonm@specifixinc.com Mon Aug 9 18:35:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79MZEbI030976 for ; Mon, 9 Aug 2004 18:35:15 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 8293416736 for ; Mon, 9 Aug 2004 15:35:45 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79MZhTD015171; Mon, 9 Aug 2004 18:35:43 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79MZhNp015165; Mon, 9 Aug 2004 18:35:43 -0400 Date: Mon, 9 Aug 2004 18:35:43 -0400 From: johnsonm@specifixinc.com Message-Id: <200408092235.i79MZhNp015165@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build destdirpolicy.py, 1.70, 1.71 packagepolicy.py, 1.121, 1.122 policy.py, 1.38, 1.39 recipe.py, 1.233, 1.234 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 22:35:16 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15153/build Modified Files: destdirpolicy.py packagepolicy.py policy.py recipe.py Log Message: policy needs to know about the recipe earlier; this fixes SharedLibrary Index: destdirpolicy.py =================================================================== RCS file: /spx/cvs/conary/build/destdirpolicy.py,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- destdirpolicy.py 5 Aug 2004 00:41:41 -0000 1.70 +++ destdirpolicy.py 9 Aug 2004 22:35:41 -0000 1.71 @@ -729,23 +729,23 @@ os.symlink(normpath, fullpath) -def DefaultPolicy(): +def DefaultPolicy(recipe): """ Returns a list of actions that expresses the default policy. """ return [ - TestSuiteLinks(), - TestSuiteFiles(), - FixDirModes(), - RemoveNonPackageFiles(), - FixupMultilibPaths(), - ExecutableLibraries(), - Strip(), - NormalizeCompression(), - NormalizeManPages(), - NormalizeInfoPages(), - NormalizeInitscripts(), - RelativeSymlinks(), + TestSuiteLinks(recipe), + TestSuiteFiles(recipe), + FixDirModes(recipe), + RemoveNonPackageFiles(recipe), + FixupMultilibPaths(recipe), + ExecutableLibraries(recipe), + Strip(recipe), + NormalizeCompression(recipe), + NormalizeManPages(recipe), + NormalizeInfoPages(recipe), + NormalizeInitscripts(recipe), + RelativeSymlinks(recipe), ] Index: packagepolicy.py =================================================================== RCS file: /spx/cvs/conary/build/packagepolicy.py,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- packagepolicy.py 9 Aug 2004 21:02:26 -0000 1.121 +++ packagepolicy.py 9 Aug 2004 22:35:41 -0000 1.122 @@ -377,7 +377,7 @@ C{r.SharedLibrary} does B{not} walk entire directory trees. Every directory that you want to add must be passed in using the - C{subtree} keyword. + C{subtrees} keyword. """ invariantsubtrees = destdirpolicy.librarydirs invariantinclusions = [ @@ -388,9 +388,8 @@ # needs to share with ExecutableLibraries and CheckSonames def updateArgs(self, *args, **keywords): policy.Policy.updateArgs(self, *args, **keywords) - # XXX there is no recipe here - only in doProcess context - # self.recipe.ExecutableLibraries(*args, **keywords) - # self.recipe.CheckSonames(*args, **keywords) + self.recipe.ExecutableLibraries(*args, **keywords) + self.recipe.CheckSonames(*args, **keywords) def doFile(self, file): fullpath = ('%(destdir)s/'+file) %self.macros @@ -904,36 +903,36 @@ -def DefaultPolicy(): +def DefaultPolicy(recipe): """ Return a list of actions that expresses the default policy. """ return [ - NonBinariesInBindirs(), - FilesInMandir(), - ImproperlyShared(), - CheckSonames(), - CheckDestDir(), - ComponentSpec(), - PackageSpec(), - EtcConfig(), - Config(), - Transient(), - SharedLibrary(), - TagDescription(), - TagSpec(), - ParseManifest(), - MakeDevices(), - DanglingSymlinks(), - AddModes(), - WarnWriteable(), - IgnoredSetuid(), - Ownership(), - ExcludeDirectories(), - Requires(), - Provides(), - Flavor(), - reportErrors(), + NonBinariesInBindirs(recipe), + FilesInMandir(recipe), + ImproperlyShared(recipe), + CheckSonames(recipe), + CheckDestDir(recipe), + ComponentSpec(recipe), + PackageSpec(recipe), + EtcConfig(recipe), + Config(recipe), + Transient(recipe), + SharedLibrary(recipe), + TagDescription(recipe), + TagSpec(recipe), + ParseManifest(recipe), + MakeDevices(recipe), + DanglingSymlinks(recipe), + AddModes(recipe), + WarnWriteable(recipe), + IgnoredSetuid(recipe), + Ownership(recipe), + ExcludeDirectories(recipe), + Requires(recipe), + Provides(recipe), + Flavor(recipe), + reportErrors(recipe), ] Index: policy.py =================================================================== RCS file: /spx/cvs/conary/build/policy.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- policy.py 4 Aug 2004 22:26:53 -0000 1.38 +++ policy.py 9 Aug 2004 22:35:41 -0000 1.39 @@ -72,7 +72,7 @@ rootdir = '%(destdir)s' - def __init__(self, *args, **keywords): + def __init__(self, recipe, **keywords): """ @keyword exceptions: Optional argument; regexp(s) specifying files to ignore while taking the policy action. It will be @@ -86,14 +86,9 @@ """ # enforce pure virtual status assert(self.__class__ is not Policy) - action.RecipeAction.__init__(self, None, [], **keywords) - # only update inclusions if specified, otherwise, do - # not overwrite None - if args: - if self.inclusions is None: - self.inclusions = [] - self.inclusions.extend(args) + action.RecipeAction.__init__(self, None, [], **keywords) + self.recipe = recipe def updateArgs(self, *args, **keywords): Index: recipe.py =================================================================== RCS file: /spx/cvs/conary/build/recipe.py,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- recipe.py 9 Aug 2004 14:56:20 -0000 1.233 +++ recipe.py 9 Aug 2004 22:35:41 -0000 1.234 @@ -486,8 +486,8 @@ assert(self.__class__ is not Recipe) self._sources = [] self._build = [] - self.destdirPolicy = destdirpolicy.DefaultPolicy() - self.packagePolicy = packagepolicy.DefaultPolicy() + self.destdirPolicy = destdirpolicy.DefaultPolicy(self) + self.packagePolicy = packagepolicy.DefaultPolicy(self) self.cfg = cfg self.laReposCache = laReposCache self.srcdirs = srcdirs From johnsonm@specifixinc.com Mon Aug 9 18:35:47 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79MZkbI030984 for ; Mon, 9 Aug 2004 18:35:46 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 47D3416736 for ; Mon, 9 Aug 2004 15:36:17 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i79MaFTD015272; Mon, 9 Aug 2004 18:36:15 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i79MaFc1015266; Mon, 9 Aug 2004 18:36:15 -0400 Date: Mon, 9 Aug 2004 18:36:15 -0400 From: johnsonm@specifixinc.com Message-Id: <200408092236.i79MaFc1015266@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build destdirpolicy.py, 1.70, 1.70.2.1 packagepolicy.py, 1.117.2.2, 1.117.2.3 policy.py, 1.38, 1.38.2.1 recipe.py, 1.231.2.1, 1.231.2.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 22:35:47 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15251/build Modified Files: Tag: conary-0_6_4-branch destdirpolicy.py packagepolicy.py policy.py recipe.py Log Message: policy needs to know about the recipe earlier; this fixes SharedLibrary Index: destdirpolicy.py =================================================================== RCS file: /spx/cvs/conary/build/destdirpolicy.py,v retrieving revision 1.70 retrieving revision 1.70.2.1 diff -u -r1.70 -r1.70.2.1 --- destdirpolicy.py 5 Aug 2004 00:41:41 -0000 1.70 +++ destdirpolicy.py 9 Aug 2004 22:36:13 -0000 1.70.2.1 @@ -729,23 +729,23 @@ os.symlink(normpath, fullpath) -def DefaultPolicy(): +def DefaultPolicy(recipe): """ Returns a list of actions that expresses the default policy. """ return [ - TestSuiteLinks(), - TestSuiteFiles(), - FixDirModes(), - RemoveNonPackageFiles(), - FixupMultilibPaths(), - ExecutableLibraries(), - Strip(), - NormalizeCompression(), - NormalizeManPages(), - NormalizeInfoPages(), - NormalizeInitscripts(), - RelativeSymlinks(), + TestSuiteLinks(recipe), + TestSuiteFiles(recipe), + FixDirModes(recipe), + RemoveNonPackageFiles(recipe), + FixupMultilibPaths(recipe), + ExecutableLibraries(recipe), + Strip(recipe), + NormalizeCompression(recipe), + NormalizeManPages(recipe), + NormalizeInfoPages(recipe), + NormalizeInitscripts(recipe), + RelativeSymlinks(recipe), ] Index: packagepolicy.py =================================================================== RCS file: /spx/cvs/conary/build/packagepolicy.py,v retrieving revision 1.117.2.2 retrieving revision 1.117.2.3 diff -u -r1.117.2.2 -r1.117.2.3 --- packagepolicy.py 9 Aug 2004 19:58:41 -0000 1.117.2.2 +++ packagepolicy.py 9 Aug 2004 22:36:13 -0000 1.117.2.3 @@ -372,7 +372,7 @@ C{r.SharedLibrary} does B{not} walk entire directory trees. Every directory that you want to add must be passed in using the - C{subtree} keyword. + C{subtrees} keyword. """ invariantsubtrees = destdirpolicy.librarydirs invariantinclusions = [ @@ -897,36 +897,36 @@ -def DefaultPolicy(): +def DefaultPolicy(recipe): """ Return a list of actions that expresses the default policy. """ return [ - NonBinariesInBindirs(), - FilesInMandir(), - ImproperlyShared(), - CheckSonames(), - CheckDestDir(), - ComponentSpec(), - PackageSpec(), - EtcConfig(), - Config(), - Transient(), - SharedLibrary(), - TagDescription(), - TagSpec(), - ParseManifest(), - MakeDevices(), - DanglingSymlinks(), - AddModes(), - WarnWriteable(), - IgnoredSetuid(), - Ownership(), - ExcludeDirectories(), - Requires(), - Provides(), - Flavor(), - reportErrors(), + NonBinariesInBindirs(recipe), + FilesInMandir(recipe), + ImproperlyShared(recipe), + CheckSonames(recipe), + CheckDestDir(recipe), + ComponentSpec(recipe), + PackageSpec(recipe), + EtcConfig(recipe), + Config(recipe), + Transient(recipe), + SharedLibrary(recipe), + TagDescription(recipe), + TagSpec(recipe), + ParseManifest(recipe), + MakeDevices(recipe), + DanglingSymlinks(recipe), + AddModes(recipe), + WarnWriteable(recipe), + IgnoredSetuid(recipe), + Ownership(recipe), + ExcludeDirectories(recipe), + Requires(recipe), + Provides(recipe), + Flavor(recipe), + reportErrors(recipe), ] Index: policy.py =================================================================== RCS file: /spx/cvs/conary/build/policy.py,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -u -r1.38 -r1.38.2.1 --- policy.py 4 Aug 2004 22:26:53 -0000 1.38 +++ policy.py 9 Aug 2004 22:36:13 -0000 1.38.2.1 @@ -72,7 +72,7 @@ rootdir = '%(destdir)s' - def __init__(self, *args, **keywords): + def __init__(self, recipe, **keywords): """ @keyword exceptions: Optional argument; regexp(s) specifying files to ignore while taking the policy action. It will be @@ -86,14 +86,9 @@ """ # enforce pure virtual status assert(self.__class__ is not Policy) - action.RecipeAction.__init__(self, None, [], **keywords) - # only update inclusions if specified, otherwise, do - # not overwrite None - if args: - if self.inclusions is None: - self.inclusions = [] - self.inclusions.extend(args) + action.RecipeAction.__init__(self, None, [], **keywords) + self.recipe = recipe def updateArgs(self, *args, **keywords): Index: recipe.py =================================================================== RCS file: /spx/cvs/conary/build/recipe.py,v retrieving revision 1.231.2.1 retrieving revision 1.231.2.2 diff -u -r1.231.2.1 -r1.231.2.2 --- recipe.py 9 Aug 2004 14:53:20 -0000 1.231.2.1 +++ recipe.py 9 Aug 2004 22:36:13 -0000 1.231.2.2 @@ -486,8 +486,8 @@ assert(self.__class__ is not Recipe) self._sources = [] self._build = [] - self.destdirPolicy = destdirpolicy.DefaultPolicy() - self.packagePolicy = packagepolicy.DefaultPolicy() + self.destdirPolicy = destdirpolicy.DefaultPolicy(self) + self.packagePolicy = packagepolicy.DefaultPolicy(self) self.cfg = cfg self.laReposCache = laReposCache self.srcdirs = srcdirs From dbc@specifixinc.com Tue Aug 10 10:29:37 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AETbbI003759 for ; Tue, 10 Aug 2004 10:29:37 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id DA8F81654A for ; Tue, 10 Aug 2004 07:30:09 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AEU8TD002838; Tue, 10 Aug 2004 10:30:08 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AEU7tw002836; Tue, 10 Aug 2004 10:30:07 -0400 Date: Tue, 10 Aug 2004 10:30:07 -0400 From: David Christian Message-Id: <200408101430.i7AEU7tw002836@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/scripts Precedence: first-class Cc: Subject: conary/scripts localoutofdate,NONE,1.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 14:29:38 -0000 Update of /cvs/conary/scripts In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv2820 Added Files: localoutofdate Log Message: Initial version --- NEW FILE localoutofdate --- #!/usr/bin/python2.3 # -*- mode: python -*- # # Copyright (c) 2004 Specifix, Inc. # # This program is distributed under the terms of the Common Public License, # version 1.0. A copy of this license should have been distributed with this # source file in a file called LICENSE. If it is not present, the license # is always available at http://www.opensource.org/licenses/cpl.php. # # This program is distributed in the hope that it will be useful, but # without any waranty; without even the implied warranty of merchantability # or fitness for a particular purpose. See the Common Public License for # full details. # """ Compares local packages against the current install label and lists those that are out of date """ import os import sys if os.path.dirname(sys.argv[0]): if sys.argv[0][0] == "/": fullPath = os.path.dirname(sys.argv[0]) else: fullPath = os.getcwd() + "/" + os.path.dirname(sys.argv[0]) else: fullPath = os.getcwd() sys.path.append(os.path.dirname(fullPath)) import conarycfg from local import database import helper import util sys.excepthook = util.excepthook cfg = conarycfg.ConaryConfiguration() repos = helper.openRepository(cfg.repositoryMap) db = database.Database(cfg.root, cfg.dbPath) pkgs = [ x for x in db.iterAllTroveNames() if x.find(':') == -1 ] pkgs.sort() versions = repos.getTroveLeavesByLabel(pkgs, cfg.installLabel) for pkg in pkgs: if not versions[pkg]: continue v = versions[pkg][0] lv = db.getTroveVersionList(pkg)[0] vt = v.trailingVersion() lvt = lv.trailingVersion() if (v.branch(),vt.getVersion(),vt.getRelease(),vt.buildCount) != (lv.branch(),lvt.getVersion(),lvt.getRelease(),lvt.buildCount): print "%-35s%-25s%-20s" % (pkg, lvt.asString(), vt.asString()) From dbc@specifixinc.com Tue Aug 10 10:41:11 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AEfAbI003773 for ; Tue, 10 Aug 2004 10:41:10 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 178781654A for ; Tue, 10 Aug 2004 07:41:43 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AEffTD003408; Tue, 10 Aug 2004 10:41:41 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AEffAC003406; Tue, 10 Aug 2004 10:41:41 -0400 Date: Tue, 10 Aug 2004 10:41:41 -0400 From: David Christian Message-Id: <200408101441.i7AEffAC003406@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/scripts Precedence: first-class Cc: Subject: conary/scripts localoutofdate,NONE,1.1.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 14:41:11 -0000 Update of /cvs/conary/scripts In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv3388 Added Files: Tag: conary-0_6_4-branch localoutofdate Log Message: Put localoutofdate on branch --- NEW FILE localoutofdate --- #!/usr/bin/python2.3 # -*- mode: python -*- # # Copyright (c) 2004 Specifix, Inc. # # This program is distributed under the terms of the Common Public License, # version 1.0. A copy of this license should have been distributed with this # source file in a file called LICENSE. If it is not present, the license # is always available at http://www.opensource.org/licenses/cpl.php. # # This program is distributed in the hope that it will be useful, but # without any waranty; without even the implied warranty of merchantability # or fitness for a particular purpose. See the Common Public License for # full details. # """ Compares local packages against the current install label and lists those that are out of date """ import os import sys if os.path.dirname(sys.argv[0]): if sys.argv[0][0] == "/": fullPath = os.path.dirname(sys.argv[0]) else: fullPath = os.getcwd() + "/" + os.path.dirname(sys.argv[0]) else: fullPath = os.getcwd() sys.path.append(os.path.dirname(fullPath)) import conarycfg from local import database import helper import util sys.excepthook = util.excepthook cfg = conarycfg.ConaryConfiguration() repos = helper.openRepository(cfg.repositoryMap) db = database.Database(cfg.root, cfg.dbPath) pkgs = [ x for x in db.iterAllTroveNames() if x.find(':') == -1 ] pkgs.sort() versions = repos.getTroveLeavesByLabel(pkgs, cfg.installLabel) for pkg in pkgs: if not versions[pkg]: continue v = versions[pkg][0] lv = db.getTroveVersionList(pkg)[0] vt = v.trailingVersion() lvt = lv.trailingVersion() if (v.branch(),vt.getVersion(),vt.getRelease(),vt.buildCount) != (lv.branch(),lvt.getVersion(),lvt.getRelease(),lvt.buildCount): print "%-35s%-25s%-20s" % (pkg, lvt.asString(), vt.asString()) From msw@specifixinc.com Tue Aug 10 11:04:10 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AF49bI003801 for ; Tue, 10 Aug 2004 11:04:09 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 324E81654A for ; Tue, 10 Aug 2004 08:04:42 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AF4eTD003968; Tue, 10 Aug 2004 11:04:40 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AF4e44003965; Tue, 10 Aug 2004 11:04:40 -0400 Date: Tue, 10 Aug 2004 11:04:40 -0400 From: Matt Wilson Message-Id: <200408101504.i7AF4e44003965@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local update.py,1.119,1.120 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 15:04:10 -0000 Update of /mnt/specifix/cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv3953 Modified Files: update.py Log Message: no need to use a docstring for a comment Index: update.py =================================================================== RCS file: /mnt/specifix/cvs/conary/local/update.py,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- update.py 5 Aug 2004 22:26:03 -0000 1.119 +++ update.py 10 Aug 2004 15:04:38 -0000 1.120 @@ -692,12 +692,12 @@ for (fileId, path, version) in newPkg.iterFileList(): fileIds[fileId] = True - """ - Iterating over the files in newPkg would be much more natural then - iterating over the ones in the old package, and then going through - newPkg to find what we missed. However, doing it the hard way lets - us iterate right over the changeset we get from the repository. - """ + + # Iterating over the files in newPkg would be much more natural + # then iterating over the ones in the old package, and then going + # through newPkg to find what we missed. However, doing it the + # hard way lets us iterate right over the changeset we get from + # the repository. if srcPkg: fileList = [ x for x in srcPkg.iterFileList() ] # need to walk changesets in order of fileid From dbc@specifixinc.com Tue Aug 10 13:30:50 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHUnbI004096 for ; Tue, 10 Aug 2004 13:30:50 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 38A4016264 for ; Tue, 10 Aug 2004 10:31:22 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHVKTD013745; Tue, 10 Aug 2004 13:31:20 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AHVKR9013741; Tue, 10 Aug 2004 13:31:20 -0400 Date: Tue, 10 Aug 2004 13:31:20 -0400 From: David Christian Message-Id: <200408101731.i7AHVKR9013741@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build destdirpolicy.py,1.70.2.1,1.70.2.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 17:30:50 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv13717/build Modified Files: Tag: conary-0_6_4-branch destdirpolicy.py Log Message: Quiet down testsuite creation Index: destdirpolicy.py =================================================================== RCS file: /cvs/conary/build/destdirpolicy.py,v retrieving revision 1.70.2.1 retrieving revision 1.70.2.2 diff -u -r1.70.2.1 -r1.70.2.2 --- destdirpolicy.py 9 Aug 2004 22:36:13 -0000 1.70.2.1 +++ destdirpolicy.py 10 Aug 2004 17:31:18 -0000 1.70.2.2 @@ -307,7 +307,7 @@ os.symlink(contents, testpath) elif os.path.isfile(fullpath): util.mkdirChain(os.path.dirname(testpath)) - util.copyfile(fullpath, testpath) + util.copyfile(fullpath, testpath, verbose=False) self.replaceBuildPath(testpath) # finally, include any symlinks that point # to the file we just copied @@ -328,7 +328,7 @@ return if extension in ('pyo', 'pyc'): # add as needed return - util.execute(("sed -i -e 's|%%(builddir)s|%%(testdir)s/%%(name)s-%%(version)s|g' '%s'" % path) % self.macros) + util.execute(("sed -i -e 's|%%(builddir)s|%%(testdir)s/%%(name)s-%%(version)s|g' '%s'" % path) % self.macros, verbose=False) class FixDirModes(policy.Policy): From dbc@specifixinc.com Tue Aug 10 13:30:51 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHUobI004099 for ; Tue, 10 Aug 2004 13:30:51 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 21A7C16759 for ; Tue, 10 Aug 2004 10:31:23 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHVKTD013744; Tue, 10 Aug 2004 13:31:20 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AHVKk6013737; Tue, 10 Aug 2004 13:31:20 -0400 Date: Tue, 10 Aug 2004 13:31:20 -0400 From: David Christian Message-Id: <200408101731.i7AHVKk6013737@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary util.py,1.70,1.70.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 17:30:51 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv13717 Modified Files: Tag: conary-0_6_4-branch util.py Log Message: Quiet down testsuite creation Index: util.py =================================================================== RCS file: /cvs/conary/util.py,v retrieving revision 1.70 retrieving revision 1.70.2.1 diff -u -r1.70 -r1.70.2.1 --- util.py 3 Aug 2004 15:28:52 -0000 1.70 +++ util.py 10 Aug 2004 17:31:18 -0000 1.70.2.1 @@ -106,8 +106,9 @@ log.error(info) raise RuntimeError, info -def execute(cmd, destDir=None): - log.debug(cmd) +def execute(cmd, destDir=None, verbose=True): + if verbose: + log.debug(cmd) if destDir: rc = os.system('cd %s; %s' %(destDir, cmd)) else: @@ -206,9 +207,10 @@ else: log.warning('file %s does not exist when attempting to delete [file]', path) -def copyfile(sources, dest): +def copyfile(sources, dest, verbose=True): for source in braceGlob(sources): - log.debug('copying %s to %s', source, dest) + if verbose: + log.debug('copying %s to %s', source, dest) shutil.copy2(source, dest) def copyfileobj(source, dest): From dbc@specifixinc.com Tue Aug 10 13:40:48 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHelbI004124 for ; Tue, 10 Aug 2004 13:40:47 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 1A55C16264 for ; Tue, 10 Aug 2004 10:41:20 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHfITD014308; Tue, 10 Aug 2004 13:41:18 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AHfIEg014305; Tue, 10 Aug 2004 13:41:18 -0400 Date: Tue, 10 Aug 2004 13:41:18 -0400 From: David Christian Message-Id: <200408101741.i7AHfIEg014305@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build macros.py,1.8,1.8.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 17:40:48 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv14285 Modified Files: Tag: conary-0_6_4-branch macros.py Log Message: Add macro copy-on-access to branch Index: macros.py =================================================================== RCS file: /cvs/conary/build/macros.py,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- macros.py 13 Jul 2004 14:33:26 -0000 1.8 +++ macros.py 10 Aug 2004 17:41:16 -0000 1.8.2.1 @@ -17,11 +17,20 @@ """ class Macros(dict): + def __init__(self, macros={}, shadow=False): + if shadow: + self.__macros = macros + else: + self.update(macros) + def update(self, other): for key, item in other.iteritems(): self[key] = item def __setitem__(self, name, value): + if name[:7] == '_Macros': + dict.__setitem__(self, name, value) + return # only expand references to ourself d = {name: self.get(name)} # escape any macros in the new value @@ -33,15 +42,23 @@ def __setattr__(self, name, value): self.__setitem__(name, value) - - def __getitem__(self, name): - return dict.__getitem__(self, name) %self + def __getitem__(self, name): + if name[:7] == '_Macros': + return dict.__getitem__(self, name) + if not name in self: + # update on access + # okay for this to fail bc of no __macros + # -- equivalent to missing dict value + value = self.__macros[name] + self[name] = value + return value + else: + return dict.__getitem__(self, name) % self + def __getattr__(self, name): return self.__getitem__(name) - def copy(self): - new = Macros() - new.update(self) - return new - + def copy(self, shadow=True): + # shadow saves initial copying cost for a higher search cost + return Macros(self, shadow) From msw@specifixinc.com Tue Aug 10 13:47:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHlGbI004134 for ; Tue, 10 Aug 2004 13:47:16 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id DCE6616264 for ; Tue, 10 Aug 2004 10:47:48 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AHllTD014725; Tue, 10 Aug 2004 13:47:47 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AHllMW014722; Tue, 10 Aug 2004 13:47:47 -0400 Date: Tue, 10 Aug 2004 13:47:47 -0400 From: Matt Wilson Message-Id: <200408101747.i7AHllMW014722@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary filecontainer.py,1.35,1.36 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 17:47:16 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv14710 Modified Files: filecontainer.py Log Message: convert comment to doc string Index: filecontainer.py =================================================================== RCS file: /mnt/specifix/cvs/conary/filecontainer.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- filecontainer.py 9 Aug 2004 13:49:32 -0000 1.35 +++ filecontainer.py 10 Aug 2004 17:47:45 -0000 1.36 @@ -300,11 +300,16 @@ def iterFileList(self): return self.entries.iterkeys() - # file is a python file object which refers to the file container - # if that file is empty (size 0) the file container is immediately - # initialized. we make our own copy of the file so the caller can - # close it if they like def __init__(self, file): + """ + Create a FileContainer object. + + @param file: an open python file object referencing the file + container file on disk. If that file is empty (size 0) the + file container is immediately initialized. A copy of the file + is retained, so the caller may optionally close it. + """ + # make our own copy of this file which nobody can close underneath us self.file = os.fdopen(os.dup(file.fileno()), file.mode) From dbc@specifixinc.com Tue Aug 10 14:14:46 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIEjbI004165 for ; Tue, 10 Aug 2004 14:14:46 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 6279F16264 for ; Tue, 10 Aug 2004 11:15:18 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIFGTD015615; Tue, 10 Aug 2004 14:15:16 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIFG9O015612; Tue, 10 Aug 2004 14:15:16 -0400 Date: Tue, 10 Aug 2004 14:15:16 -0400 From: David Christian Message-Id: <200408101815.i7AIFG9O015612@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build macros.py,1.8.2.1,1.8.2.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:14:46 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15594 Modified Files: Tag: conary-0_6_4-branch macros.py Log Message: Add tracking of macro changes Index: macros.py =================================================================== RCS file: /cvs/conary/build/macros.py,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -r1.8.2.1 -r1.8.2.2 --- macros.py 10 Aug 2004 17:41:16 -0000 1.8.2.1 +++ macros.py 10 Aug 2004 18:15:14 -0000 1.8.2.2 @@ -18,9 +18,12 @@ class Macros(dict): def __init__(self, macros={}, shadow=False): + self.__tracked = {} + self.__track = False if shadow: self.__macros = macros else: + self.__macros = {} self.update(macros) def update(self, other): @@ -31,6 +34,8 @@ if name[:7] == '_Macros': dict.__setitem__(self, name, value) return + if self.__track: + self.__tracked[name] = 1 # only expand references to ourself d = {name: self.get(name)} # escape any macros in the new value @@ -58,7 +63,14 @@ def __getattr__(self, name): return self.__getitem__(name) + + def trackChanges(self, flag=True): + self.__track = flag + + def getTrackedChanges(self): + return self.__tracked.keys() def copy(self, shadow=True): # shadow saves initial copying cost for a higher search cost + # return Macros(self, shadow) From dbc@specifixinc.com Tue Aug 10 14:15:11 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIFBbI004175 for ; Tue, 10 Aug 2004 14:15:11 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 8C20F16264 for ; Tue, 10 Aug 2004 11:15:43 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIFfTD015675; Tue, 10 Aug 2004 14:15:41 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIFfH7015672; Tue, 10 Aug 2004 14:15:41 -0400 Date: Tue, 10 Aug 2004 14:15:41 -0400 From: David Christian Message-Id: <200408101815.i7AIFfH7015672@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build buildinfo.py,1.1,1.1.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:15:11 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15635 Modified Files: Tag: conary-0_6_4-branch buildinfo.py Log Message: Add support for storing dict entries Index: buildinfo.py =================================================================== RCS file: /cvs/conary/build/buildinfo.py,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- buildinfo.py 19 Jul 2004 17:28:46 -0000 1.1 +++ buildinfo.py 10 Aug 2004 18:15:39 -0000 1.1.2.1 @@ -31,8 +31,22 @@ lines = self.__fd.readlines() self.__fd.close() for line in lines: + if line == '\n': + continue (key, value) = line.split(None, 1) - self.__dict__[key] = value[:-1] + #handle macros.foo + keys = key.split('.') + if len(keys) > 1: + subdicts = keys[:-1] + key = keys[-1] + curdict = self.__dict__ + for subdict in subdicts: + if subdict not in curdict: + curdict[subdict] = {} + curdict = curdict[subdict] + curdict[key] = value[:-1] + else: + self.__dict__[key] = value[:-1] def begin(self): self.__fd = open(self.__infofile, "w") From johnsonm@specifixinc.com Tue Aug 10 14:16:43 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIGhbI004183 for ; Tue, 10 Aug 2004 14:16:43 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 06F1216264 for ; Tue, 10 Aug 2004 11:17:16 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIHETD015949; Tue, 10 Aug 2004 14:17:14 -0400 Received: (from johnsonm@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIHERS015945; Tue, 10 Aug 2004 14:17:14 -0400 Date: Tue, 10 Aug 2004 14:17:14 -0400 From: johnsonm@specifixinc.com Message-Id: <200408101817.i7AIHERS015945@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build action.py, 1.10.2.1, 1.10.2.2 source.py, 1.29.2.1, 1.29.2.2 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:16:43 -0000 Update of /spx/cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv15933 Modified Files: Tag: conary-0_6_4-branch action.py source.py Log Message: make it easier to write extraSource items Index: action.py =================================================================== RCS file: /spx/cvs/conary/build/action.py,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -r1.10.2.1 -r1.10.2.2 --- action.py 9 Aug 2004 14:28:11 -0000 1.10.2.1 +++ action.py 10 Aug 2004 18:17:12 -0000 1.10.2.2 @@ -159,6 +159,9 @@ sys.excepthook = oldexcepthook + def doPrep(self): + pass + def do(self): pass Index: source.py =================================================================== RCS file: /spx/cvs/conary/build/source.py,v retrieving revision 1.29.2.1 retrieving revision 1.29.2.2 diff -u -r1.29.2.1 -r1.29.2.2 --- source.py 9 Aug 2004 14:53:20 -0000 1.29.2.1 +++ source.py 10 Aug 2004 18:17:12 -0000 1.29.2.2 @@ -401,9 +401,6 @@ util.mkdirChain(destDir) util.execute(self.action %self.recipe.macros, destDir) - def doPrep(self): - pass - def fetch(self): return None From ewt@specifixinc.com Tue Aug 10 14:19:01 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIJ1bI004191 for ; Tue, 10 Aug 2004 14:19:01 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id F1B4016264 for ; Tue, 10 Aug 2004 11:19:33 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIJWTD016079; Tue, 10 Aug 2004 14:19:32 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIJWMo016074; Tue, 10 Aug 2004 14:19:32 -0400 Date: Tue, 10 Aug 2004 14:19:32 -0400 From: ewt@specifixinc.com Message-Id: <200408101819.i7AIJWMo016074@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository filecontents.py, 1.17, 1.18 repository.py, 1.163, 1.164 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:19:02 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16053/repository Modified Files: filecontents.py repository.py Log Message: troves store fileids and sha1s as binaries and files track sha1s as binaries Index: filecontents.py =================================================================== RCS file: /cvs/conary/repository/filecontents.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- filecontents.py 4 Aug 2004 16:54:12 -0000 1.17 +++ filecontents.py 10 Aug 2004 18:19:30 -0000 1.18 @@ -14,6 +14,7 @@ import os from StringIO import StringIO +import sha1helper SEEK_SET=-1 SEEK_CUR=1 @@ -38,7 +39,7 @@ return self.__class__(self.repos, self.sha1, self.theSize) def get(self): - return self.store.openFile(self.sha1) + return self.store.openFile(sha1helper.sha1ToString(self.sha1)) def size(self): return self.theSize Index: repository.py =================================================================== RCS file: /cvs/conary/repository/repository.py,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- repository.py 9 Aug 2004 13:38:43 -0000 1.163 +++ repository.py 10 Aug 2004 18:19:30 -0000 1.164 @@ -19,6 +19,7 @@ import deps.deps import files import patch +import sha1helper import tempfile import trove import util @@ -450,23 +451,24 @@ def _storeFileFromContents(self, contents, sha1, restoreContents): if restoreContents: - self.contentsStore.addFile(contents.get(), sha1) + self.contentsStore.addFile(contents.get(), + sha1helper.sha1ToString(sha1)) else: # the file doesn't have any contents, so it must exist # in the data store already; we still need to increment # the reference count for it - self.contentsStore.addFileReference(file.contents.sha1()) + self.contentsStore.addFileReference(sha1helper.sha1ToString(sha1)) return 1 def _removeFileContents(self, sha1): - self.contentsStore.removeFile(sha1) + self.contentsStore.removeFile(sha1helper.sha1ToString(sha1)) def _getFileObject(self, sha1): - return self.contentsStore.openFile(sha1) + return self.contentsStore.openFile(sha1helper.sha1ToString(sha1)) - def _hasFileContents(self, fileId): - return self.contentsStore.hasFile(fileId) + def _hasFileContents(self, sha1): + return self.contentsStore.hasFile(sha1helper.sha1ToString(sha1)) def getFileContents(self, troveName, troveVersion, troveFlavor, path, fileVersion, fileObj = None): From ewt@specifixinc.com Tue Aug 10 14:19:02 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIJ2bI004194 for ; Tue, 10 Aug 2004 14:19:02 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 8E32416759 for ; Tue, 10 Aug 2004 11:19:34 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIJWTD016078; Tue, 10 Aug 2004 14:19:32 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIJWcZ016068; Tue, 10 Aug 2004 14:19:32 -0400 Date: Tue, 10 Aug 2004 14:19:32 -0400 From: ewt@specifixinc.com Message-Id: <200408101819.i7AIJWcZ016068@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary files.py, 1.160, 1.161 sha1helper.py, 1.7, 1.8 streams.py, 1.16, 1.17 trove.py, 1.149, 1.150 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:19:02 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16053 Modified Files: files.py sha1helper.py streams.py trove.py Log Message: troves store fileids and sha1s as binaries and files track sha1s as binaries Index: files.py =================================================================== RCS file: /cvs/conary/files.py,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- files.py 9 Aug 2004 22:04:34 -0000 1.160 +++ files.py 10 Aug 2004 18:19:30 -0000 1.161 @@ -64,7 +64,7 @@ __slots__ = [] makeup = (("size", streams.LongLongStream, 8), - ("sha1", streams.Sha1Stream, 40)) + ("sha1", streams.Sha1Stream, 20)) def size(self): return self.items[0].value() @@ -513,7 +513,7 @@ return possibleMatch if needsSha1: - sha1 = sha1helper.hashFile(path) + sha1 = sha1helper.hashFileBin(path) f.contents = RegularFileStream() f.contents.setSize(s.st_size) f.contents.setSha1(sha1) Index: sha1helper.py =================================================================== RCS file: /cvs/conary/sha1helper.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sha1helper.py 19 Jul 2004 15:22:44 -0000 1.7 +++ sha1helper.py 10 Aug 2004 18:19:30 -0000 1.8 @@ -14,6 +14,7 @@ import sha import os +import struct def hashFile(path): fd = os.open(path, os.O_RDONLY) @@ -26,7 +27,22 @@ return m.hexdigest() +def hashFileBin(path): + fd = os.open(path, os.O_RDONLY) + m = sha.new() + buf = os.read(fd, 40960) + while len(buf): + m.update(buf) + buf = os.read(fd, 40960) + os.close(fd) + + return m.digest() + def hashString(buf): m = sha.new() m.update(buf) return m.hexdigest() + +def sha1ToString(buf): + assert(len(buf) == 20) + return "%08x%08x%08x%08x%08x" % struct.unpack("!5I", buf) Index: streams.py =================================================================== RCS file: /cvs/conary/streams.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- streams.py 9 Aug 2004 22:04:34 -0000 1.16 +++ streams.py 10 Aug 2004 18:19:30 -0000 1.17 @@ -148,6 +148,9 @@ def freeze(self): return self.s + def asString(self): + return self.s + def diff(self, them): if self.s != them.s: return self.s @@ -178,15 +181,31 @@ class Sha1Stream(StringStream): def freeze(self): - assert(len(self.s) == 40) - return struct.pack("!5I", int(self.s[ 0: 8], 16), - int(self.s[ 8:16], 16), int(self.s[16:24], 16), - int(self.s[24:32], 16), int(self.s[32:40], 16)) + assert(len(self.s) == 20) + return self.s + + def asString(self): + return "%08x%08x%08x%08x%08x" % struct.unpack("!5I", self.s) def thaw(self, data): if data: assert(len(data) == 20) - self.s = "%08x%08x%08x%08x%08x" % struct.unpack("!5I", data) + self.s = data + + def twm(self, diff, base): + assert(len(diff) == 20) + assert(len(base.s) == 20) + assert(len(self.s) == 20) + StringStream.twm(self, diff, base) + + def set(self, val): + assert(len(val) == 20) + self.s = val + + def setFromString(self, val): + self.s = struct.pack("!5I", int(val[ 0: 8], 16), + int(val[ 8:16], 16), int(val[16:24], 16), + int(val[24:32], 16), int(val[32:40], 16)) class FrozenVersionStream(InfoStream): @@ -384,7 +403,7 @@ items.append(itemType(s[idx:idx + size])) elif (i + 1) == len(makeup): items.append(itemType(s[idx:])) - size = 0 + size = len(s) - idx else: if size == "B": size = struct.unpack("B", s[idx])[0] @@ -399,6 +418,8 @@ idx += size + assert(idx == len(s)) + self.items = items def __init__(self, first = None, *rest): Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- trove.py 9 Aug 2004 22:04:34 -0000 1.149 +++ trove.py 10 Aug 2004 18:19:30 -0000 1.150 @@ -612,7 +612,7 @@ sha1 = streams.Sha1Stream() for (fileId, path, version) in self: - sha1.set(fileId) + sha1.setFromString(fileId) l.append(sha1.freeze()) if not path: path = "" @@ -639,7 +639,7 @@ while i < len(data): # XXX this can go away once we track binary fileids sha1 = streams.Sha1Stream(data[i:i+20]) - fileId = sha1.value() + fileId = sha1.asString() i += 20 pathLen = struct.unpack("!H", data[i:i+2])[0] From ewt@specifixinc.com Tue Aug 10 14:31:50 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIVobI004221 for ; Tue, 10 Aug 2004 14:31:50 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id C935B16264 for ; Tue, 10 Aug 2004 11:32:22 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIWLTD016440; Tue, 10 Aug 2004 14:32:21 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIWKQx016437; Tue, 10 Aug 2004 14:32:20 -0400 Date: Tue, 10 Aug 2004 14:32:20 -0400 From: ewt@specifixinc.com Message-Id: <200408101832.i7AIWKQx016437@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.149,1.150 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:31:50 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16399/repository Modified Files: changeset.py Log Message: file information for changesets is stored as sha1's Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- changeset.py 9 Aug 2004 20:54:21 -0000 1.149 +++ changeset.py 10 Aug 2004 18:32:18 -0000 1.150 @@ -35,13 +35,13 @@ __slots__ = [] # fileId, oldVersion, newVersion, csInfo - makeup = (("fileId", streams.StringStream, 40), + makeup = (("fileId", streams.Sha1Stream, 20), ("oldVersion", streams.StringStream, "!H"), ("newVersion", streams.StringStream, "!H"), ("csInfo", streams.StringStream, "B")) def fileId(self): - return self.items[0].value() + return self.items[0].asString() def setFileId(self, value): return self.items[0].set(value) @@ -64,6 +64,16 @@ def setCsInfo(self, value): return self.items[3].set(value) + def __init__(self, first = None, oldStr = None, newVer = None, chg = None): + # XXX this can go away once we track binary fileids + if oldStr is None: + streams.TupleStream.__init__(self, first) + else: + sha1 = streams.Sha1Stream() + sha1.setFromString(first) + + streams.TupleStream.__init__(self, sha1.freeze(), oldStr, newVer, chg) + class ChangeSetNewPackageList(dict, streams.InfoStream): def freeze(self): @@ -94,8 +104,13 @@ class ChangeSetFileDict(dict, streams.InfoStream): def freeze(self): + # XXX this can go away once we track binary fileids + sha1 = streams.Sha1Stream() + fileList = [] for (fileId, (oldVersion, newVersion, csInfo)) in self.iteritems(): + sha1.setFromString(fileId) + if oldVersion: oldStr = oldVersion.asString() else: From ewt@specifixinc.com Tue Aug 10 14:42:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIgGbI004242 for ; Tue, 10 Aug 2004 14:42:16 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id D649116264 for ; Tue, 10 Aug 2004 11:42:48 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIglTD016948; Tue, 10 Aug 2004 14:42:47 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIglfY016944; Tue, 10 Aug 2004 14:42:47 -0400 Date: Tue, 10 Aug 2004 14:42:47 -0400 From: ewt@specifixinc.com Message-Id: <200408101842.i7AIglfY016944@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/scripts Precedence: first-class Cc: Subject: conary/scripts dumpcontainer,1.9,1.10 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:42:16 -0000 Update of /cvs/conary/scripts In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16901/scripts Modified Files: dumpcontainer Log Message: switch filenames in filecontainer to binary sha1's Index: dumpcontainer =================================================================== RCS file: /cvs/conary/scripts/dumpcontainer,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dumpcontainer 4 Aug 2004 16:54:12 -0000 1.9 +++ dumpcontainer 10 Aug 2004 18:42:45 -0000 1.10 @@ -28,6 +28,7 @@ sys.path.append(os.path.dirname(fullPath)) from filecontainer import FileContainer +import sha1helper f = open(sys.argv[1], "r") c = FileContainer(f) @@ -36,12 +37,19 @@ rc = c.getNextFile() while rc: (name, tag, f, size) = rc + if len(name) == 20: + name = sha1helper.sha1ToString(name) + print "%s (%s)" % (name, tag) rc = c.getNextFile() elif len(sys.argv) == 3: - f = c.getFile(sys.argv[2]) + name = sys.argv[2] + if len(name) == 40: + name = sha1helper.sha1FromString(name) + + f = c.getFile(name)[1] sys.stdout.write(f.read()) - f.close + f.close() else: for file in sys.argv[2:]: print "--", file From ewt@specifixinc.com Tue Aug 10 14:42:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIgGbI004243 for ; Tue, 10 Aug 2004 14:42:16 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 0B91D16759 for ; Tue, 10 Aug 2004 11:42:49 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIglTD016949; Tue, 10 Aug 2004 14:42:47 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIgltY016940; Tue, 10 Aug 2004 14:42:47 -0400 Date: Tue, 10 Aug 2004 14:42:47 -0400 From: ewt@specifixinc.com Message-Id: <200408101842.i7AIgltY016940@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.150,1.151 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:42:17 -0000 Update of /cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16901/repository Modified Files: changeset.py Log Message: switch filenames in filecontainer to binary sha1's Index: changeset.py =================================================================== RCS file: /cvs/conary/repository/changeset.py,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- changeset.py 10 Aug 2004 18:32:18 -0000 1.150 +++ changeset.py 10 Aug 2004 18:42:45 -0000 1.151 @@ -307,6 +307,9 @@ for hash in idList: (contType, f) = contents[hash] + # XXX this can go away once we track fileids as binary + import sha1helper + hash = sha1helper.sha1FromString(hash) csf.addFile(hash, f, tag + contType[4:]) def writeAllContents(self, csf): @@ -610,7 +613,10 @@ cont = filecontents.FromString(str) size = len(str) else: - (tagInfo, f, size) = self.csf.getFile(fileId) + # XXX this can go away once we track fileids as binary + import sha1helper + hash = sha1helper.sha1FromString(fileId) + (tagInfo, f, size) = self.csf.getFile(hash) tag = "cft-" + tagInfo.split()[1] cont = filecontents.FromFile(f) From ewt@specifixinc.com Tue Aug 10 14:42:16 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIgGbI004244 for ; Tue, 10 Aug 2004 14:42:16 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 1A4F01675B for ; Tue, 10 Aug 2004 11:42:49 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIglTD016947; Tue, 10 Aug 2004 14:42:47 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AIgluQ016936; Tue, 10 Aug 2004 14:42:47 -0400 Date: Tue, 10 Aug 2004 14:42:47 -0400 From: ewt@specifixinc.com Message-Id: <200408101842.i7AIgluQ016936@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary sha1helper.py,1.8,1.9 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:42:17 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv16901 Modified Files: sha1helper.py Log Message: switch filenames in filecontainer to binary sha1's Index: sha1helper.py =================================================================== RCS file: /cvs/conary/sha1helper.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sha1helper.py 10 Aug 2004 18:19:30 -0000 1.8 +++ sha1helper.py 10 Aug 2004 18:42:45 -0000 1.9 @@ -46,3 +46,9 @@ def sha1ToString(buf): assert(len(buf) == 20) return "%08x%08x%08x%08x%08x" % struct.unpack("!5I", buf) + +def sha1FromString(val): + assert(len(val) == 40) + return struct.pack("!5I", int(val[ 0: 8], 16), + int(val[ 8:16], 16), int(val[16:24], 16), + int(val[24:32], 16), int(val[32:40], 16)) From dbc@specifixinc.com Tue Aug 10 14:54:39 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AIsdbI004286 for ; Tue, 10 Aug 2004 14:54:39 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id CDF7E16264 for ; Tue, 10 Aug 2004 11:55:11 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AItATD017721; Tue, 10 Aug 2004 14:55:10 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AItAFM017717; Tue, 10 Aug 2004 14:55:10 -0400 Date: Tue, 10 Aug 2004 14:55:10 -0400 From: David Christian Message-Id: <200408101855.i7AItAFM017717@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build buildinfo.py,1.1,1.2 macros.py,1.9,1.10 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:54:39 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv17695 Modified Files: buildinfo.py macros.py Log Message: Add macro tracking Add buildinfo support for dicts Index: buildinfo.py =================================================================== RCS file: /cvs/conary/build/buildinfo.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- buildinfo.py 19 Jul 2004 17:28:46 -0000 1.1 +++ buildinfo.py 10 Aug 2004 18:55:08 -0000 1.2 @@ -31,8 +31,22 @@ lines = self.__fd.readlines() self.__fd.close() for line in lines: + if line == '\n': + continue (key, value) = line.split(None, 1) - self.__dict__[key] = value[:-1] + #handle macros.foo + keys = key.split('.') + if len(keys) > 1: + subdicts = keys[:-1] + key = keys[-1] + curdict = self.__dict__ + for subdict in subdicts: + if subdict not in curdict: + curdict[subdict] = {} + curdict = curdict[subdict] + curdict[key] = value[:-1] + else: + self.__dict__[key] = value[:-1] def begin(self): self.__fd = open(self.__infofile, "w") Index: macros.py =================================================================== RCS file: /cvs/conary/build/macros.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- macros.py 9 Aug 2004 13:41:15 -0000 1.9 +++ macros.py 10 Aug 2004 18:55:08 -0000 1.10 @@ -18,9 +18,12 @@ class Macros(dict): def __init__(self, macros={}, shadow=False): + self.__tracked = {} + self.__track = False if shadow: self.__macros = macros else: + self.__macros = {} self.update(macros) def update(self, other): @@ -31,6 +34,8 @@ if name[:7] == '_Macros': dict.__setitem__(self, name, value) return + if self.__track: + self.__tracked[name] = 1 # only expand references to ourself d = {name: self.get(name)} # escape any macros in the new value @@ -58,6 +63,12 @@ def __getattr__(self, name): return self.__getitem__(name) + + def trackChanges(self, flag=True): + self.__track = flag + + def getTrackedChanges(self): + return self.__tracked.keys() def copy(self, shadow=True): # shadow saves initial copying cost for a higher search cost From dbc@specifixinc.com Tue Aug 10 15:08:54 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJ8qbI004322 for ; Tue, 10 Aug 2004 15:08:54 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 005CE16759 for ; Tue, 10 Aug 2004 12:09:25 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJ9NTD018472; Tue, 10 Aug 2004 15:09:23 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AJ9MIr018465; Tue, 10 Aug 2004 15:09:22 -0400 Date: Tue, 10 Aug 2004 15:09:22 -0400 From: David Christian Message-Id: <200408101909.i7AJ9MIr018465@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary util.py,1.72,1.73 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 19:08:54 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18451 Modified Files: util.py Log Message: Quiet down testsuite generation Index: util.py =================================================================== RCS file: /cvs/conary/util.py,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- util.py 6 Aug 2004 19:07:37 -0000 1.72 +++ util.py 10 Aug 2004 19:09:20 -0000 1.73 @@ -106,8 +106,9 @@ log.error(info) raise RuntimeError, info -def execute(cmd, destDir=None): - log.debug(cmd) +def execute(cmd, destDir=None, verbose=True): + if verbose: + log.debug(cmd) if destDir: rc = os.system('cd %s; %s' %(destDir, cmd)) else: @@ -208,9 +209,10 @@ else: log.warning('file %s does not exist when attempting to delete [file]', path) -def copyfile(sources, dest): +def copyfile(sources, dest, verbose=True): for source in braceGlob(sources): - log.debug('copying %s to %s', source, dest) + if verbose: + log.debug('copying %s to %s', source, dest) shutil.copy2(source, dest) def copyfileobj(source, dest): From dbc@specifixinc.com Tue Aug 10 15:08:55 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJ8tbI004325 for ; Tue, 10 Aug 2004 15:08:55 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 8728116745 for ; Tue, 10 Aug 2004 12:09:24 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJ9NTD018473; Tue, 10 Aug 2004 15:09:23 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AJ9M6H018469; Tue, 10 Aug 2004 15:09:22 -0400 Date: Tue, 10 Aug 2004 15:09:22 -0400 From: David Christian Message-Id: <200408101909.i7AJ9M6H018469@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/build Precedence: first-class Cc: Subject: conary/build destdirpolicy.py,1.71,1.72 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 19:08:55 -0000 Update of /cvs/conary/build In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv18451/build Modified Files: destdirpolicy.py Log Message: Quiet down testsuite generation Index: destdirpolicy.py =================================================================== RCS file: /cvs/conary/build/destdirpolicy.py,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- destdirpolicy.py 9 Aug 2004 22:35:41 -0000 1.71 +++ destdirpolicy.py 10 Aug 2004 19:09:20 -0000 1.72 @@ -307,7 +307,7 @@ os.symlink(contents, testpath) elif os.path.isfile(fullpath): util.mkdirChain(os.path.dirname(testpath)) - util.copyfile(fullpath, testpath) + util.copyfile(fullpath, testpath, verbose=False) self.replaceBuildPath(testpath) # finally, include any symlinks that point # to the file we just copied @@ -328,7 +328,7 @@ return if extension in ('pyo', 'pyc'): # add as needed return - util.execute(("sed -i -e 's|%%(builddir)s|%%(testdir)s/%%(name)s-%%(version)s|g' '%s'" % path) % self.macros) + util.execute(("sed -i -e 's|%%(builddir)s|%%(testdir)s/%%(name)s-%%(version)s|g' '%s'" % path) % self.macros, verbose=False) class FixDirModes(policy.Policy): From msw@specifixinc.com Tue Aug 10 15:27:40 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJRebI004383 for ; Tue, 10 Aug 2004 15:27:40 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id C404616745 for ; Tue, 10 Aug 2004 12:28:12 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJSBTD019250; Tue, 10 Aug 2004 15:28:11 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AJSAH9019247; Tue, 10 Aug 2004 15:28:10 -0400 Date: Tue, 10 Aug 2004 15:28:10 -0400 From: Matt Wilson Message-Id: <200408101928.i7AJSAH9019247@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary filecontainer.py,1.36,1.37 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 19:27:40 -0000 Update of /mnt/specifix/cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv19229 Modified Files: filecontainer.py Log Message: change comment to docstring Index: filecontainer.py =================================================================== RCS file: /mnt/specifix/cvs/conary/filecontainer.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- filecontainer.py 10 Aug 2004 17:47:45 -0000 1.36 +++ filecontainer.py 10 Aug 2004 19:28:08 -0000 1.37 @@ -246,9 +246,14 @@ return (name, tag, fcf, size) def getFile(self, fileName): - # returns a file-ish object for accessing a member of the - # container in read-only mode. the object provides a very - # small number of functions + """ + Returns a file-like object for accessing a member of the + container in read-only mode. The object provides a very + small number of functions. + + @param fileName: name of file to retrieve from the file container + @type fileName: str + """ assert(not self.mutable) eatCount = self.next - self.gzfile.tell() From ewt@specifixinc.com Tue Aug 10 15:39:26 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJdQbI004404 for ; Tue, 10 Aug 2004 15:39:26 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id E950C16745 for ; Tue, 10 Aug 2004 12:39:58 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AJdvTD020050; Tue, 10 Aug 2004 15:39:57 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AJdvAr020047; Tue, 10 Aug 2004 15:39:57 -0400 Date: Tue, 10 Aug 2004 15:39:57 -0400 From: ewt@specifixinc.com Message-Id: <200408101939.i7AJdvAr020047@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary trove.py,1.150,1.151 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 19:39:26 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv20035 Modified Files: trove.py Log Message: missed () on call to getOldVersion Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- trove.py 10 Aug 2004 18:19:30 -0000 1.150 +++ trove.py 10 Aug 2004 19:39:55 -0000 1.151 @@ -810,7 +810,7 @@ if self.isAbsolute(): f.write("absolute ") elif self.getOldVersion(): - f.write("from %s to " % self.getOldVersion.asString()) + f.write("from %s to " % self.getOldVersion().asString()) else: f.write("new ") From msw@specifixinc.com Tue Aug 10 16:39:40 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AKddbI004543 for ; Tue, 10 Aug 2004 16:39:40 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 5F24C16745 for ; Tue, 10 Aug 2004 13:40:12 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AKeATD022952; Tue, 10 Aug 2004 16:40:10 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AKeA97022949; Tue, 10 Aug 2004 16:40:10 -0400 Date: Tue, 10 Aug 2004 16:40:10 -0400 From: Matt Wilson Message-Id: <200408102040.i7AKeA97022949@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.151,1.152 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 20:39:40 -0000 Update of /mnt/specifix/cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv22937 Modified Files: changeset.py Log Message: cache all config file contents as they are read Index: changeset.py =================================================================== RCS file: /mnt/specifix/cvs/conary/repository/changeset.py,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- changeset.py 10 Aug 2004 18:42:45 -0000 1.151 +++ changeset.py 10 Aug 2004 20:40:08 -0000 1.152 @@ -608,23 +608,40 @@ return self.csf.getSize(fileId) def getFileContents(self, fileId, withSize = False): - if self.configCache.has_key(fileId): - (tag, str) = self.configCache[fileId] + # XXX this can go away once we track fileids as binary + import sha1helper + binFileId = sha1helper.sha1FromString(fileId) + if self.configCache.has_key(binFileId): + (tag, str) = self.configCache[binFileId] cont = filecontents.FromString(str) size = len(str) else: - # XXX this can go away once we track fileids as binary - import sha1helper - hash = sha1helper.sha1FromString(fileId) - (tagInfo, f, size) = self.csf.getFile(hash) - tag = "cft-" + tagInfo.split()[1] - cont = filecontents.FromFile(f) - - if tagInfo[0] == "1": - str = cont.get().read() - self.configCache[fileId] = (tag, str) - cont = filecontents.FromString(str) - size = len(str) + while True: + rc = self.csf.getNextFile() + + # we have reached the end, without finding our fileId + if rc is None: + raise KeyError, 'fileId %s is not in the changeset' %fileId + + name, tagInfo, f, size = rc + + # if we found the fileId we're looking for, or the fileId + # we got is a config file, cache or break out of the loop + # accordingly + if name == binFileId or tagInfo[0] == '1': + tag = 'cft-' + tagInfo.split()[1] + cont = filecontents.FromFile(f) + + # cache all config file contents + if tagInfo[0] == '1': + str = cont.get().read() + size = len(str) + self.configCache[name] = (tag, str) + cont = filecontents.FromString(str) + + # we found the one we're looking for, break out + if name == binFileId: + break if withSize: return (tag, cont, size) From ewt@specifixinc.com Tue Aug 10 16:57:07 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AKv7bI004560 for ; Tue, 10 Aug 2004 16:57:07 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id D92781620B for ; Tue, 10 Aug 2004 13:57:39 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AKvcTD024077; Tue, 10 Aug 2004 16:57:38 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AKvcCp024073; Tue, 10 Aug 2004 16:57:38 -0400 Date: Tue, 10 Aug 2004 16:57:38 -0400 From: ewt@specifixinc.com Message-Id: <200408102057.i7AKvcCp024073@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local database.py,1.135,1.136 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 20:57:07 -0000 Update of /cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv24034/local Modified Files: database.py Log Message: fixes for switching between branches w/ multiple troves sharing labels Index: database.py =================================================================== RCS file: /cvs/conary/local/database.py,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- database.py 9 Aug 2004 14:38:07 -0000 1.135 +++ database.py 10 Aug 2004 20:57:36 -0000 1.136 @@ -229,7 +229,15 @@ items.append((newPkg.getName(), newPkg.getVersion(), newPkg.getFlavor())) - outdated = helper.outdatedTroves(self, items) + outdated, eraseList = helper.outdatedTroves(self, items) + + # this is the same code as eraseTroves(), + for (name, version, flavor) in eraseList: + outerTrove = self.getTrove(name, version, flavor) + + for trove in self.walkTroveSet(outerTrove, ignoreMissing = True): + cs.oldPackage(trove.getName(), trove.getVersion(), + trove.getFlavor()) for newPkg in job.newPackageList(): pkgName = newPkg.getName() From ewt@specifixinc.com Tue Aug 10 16:57:08 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AKv7bI004563 for ; Tue, 10 Aug 2004 16:57:07 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 56FE31675B for ; Tue, 10 Aug 2004 13:57:40 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7AKvcTD024076; Tue, 10 Aug 2004 16:57:38 -0400 Received: (from ewt@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7AKvc6w024067; Tue, 10 Aug 2004 16:57:38 -0400 Date: Tue, 10 Aug 2004 16:57:38 -0400 From: ewt@specifixinc.com Message-Id: <200408102057.i7AKvc6w024067@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary helper.py, 1.47, 1.48 trove.py, 1.151, 1.152 updatecmd.py, 1.97, 1.98 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 20:57:08 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv24034 Modified Files: helper.py trove.py updatecmd.py Log Message: fixes for switching between branches w/ multiple troves sharing labels Index: helper.py =================================================================== RCS file: /cvs/conary/helper.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- helper.py 5 Aug 2004 21:53:19 -0000 1.47 +++ helper.py 10 Aug 2004 20:57:36 -0000 1.48 @@ -221,11 +221,15 @@ trvChgs = newGroup.diff(instGroup)[2] resultDict = {} + eraseList = [] for (name, oldVersion, newVersion, oldFlavor, newFlavor) in trvChgs: - resultDict[(name, newVersion, newFlavor)] = (name, oldVersion, - oldFlavor) + if not newVersion: + eraseList.append((name, oldVersion, oldFlavor)) + else: + resultDict[(name, newVersion, newFlavor)] = (name, oldVersion, + oldFlavor) - return resultDict + return resultDict, eraseList class PackageNotFound(Exception): Index: trove.py =================================================================== RCS file: /cvs/conary/trove.py,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- trove.py 10 Aug 2004 19:39:55 -0000 1.151 +++ trove.py 10 Aug 2004 20:57:36 -0000 1.152 @@ -487,7 +487,7 @@ # the diff. if we can't do that and only one version of this # package is being obsoleted, use that for the diff. if we # can't do that either, throw up our hands in a fit of pique - + for version in newVersionList: branch = version.branch() if version.hasParent(): @@ -495,30 +495,51 @@ else: parent = None - if len(oldVersionList) == 1: + if not oldVersionList: + # no nice match, that's too bad + pkgList.append((name, None, version, None, newFlavor)) + elif len(oldVersionList) == 1: pkgList.append((name, oldVersionList[0], version, oldFlavor, newFlavor)) + del oldVersionList[0] else: sameBranch = None parentNode = None + childNode = None + childBranch = None for other in oldVersionList: if other.branch() == branch: sameBranch = other if parent and other == parent: parentNode = other - - if sameBranch: - pkgList.append((name, sameBranch, version, - oldFlavor, newFlavor)) - elif parentNode: - pkgList.append((name, parentNode, version, + if other.hasParent(): + if other.parent() == version: + childNode = other + if other.parent().branch() == branch: + childBranch = other + + # none is a sentinel + priority = [ sameBranch, parentNode, childNode, + childBranch, None ] + + for match in priority: + if match is not None: + break + + if match is not None: + oldVersionList.remove(match) + pkgList.append((name, match, version, oldFlavor, newFlavor)) else: # Here's the fit of pique. This shouldn't happen # except for the most ill-formed of groups. raise IOError, "ick. yuck. blech. ptooey." + # remove old versions which didn't get matches + for oldVersion in oldVersionList: + pkgList.append((name, oldVersion, None, oldFlavor, None)) + return (chgSet, filesNeeded, pkgList) def setProvides(self, provides): Index: updatecmd.py =================================================================== RCS file: /cvs/conary/updatecmd.py,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- updatecmd.py 5 Aug 2004 21:53:19 -0000 1.97 +++ updatecmd.py 10 Aug 2004 20:57:36 -0000 1.98 @@ -55,6 +55,8 @@ "Conary change set is being installed.\n") return 1 + eraseList = [] + if not cs: # so far no changeset (either the path didn't exist or we could not # read it @@ -72,14 +74,12 @@ # everything which needs to be installed is in this list; if it's # not here, it's a duplicate - outdated = helper.outdatedTroves(db, newItems) + outdated, eraseList = helper.outdatedTroves(db, newItems) list = [] - for newItem in newItems: - (name, newVersion, newFlavor) = newItem - if outdated.has_key(newItem): - (oldVersion, oldFlavor) = outdated[newItem][1:3] - list.append((name, (oldVersion, oldFlavor), - (newVersion, newFlavor), 0)) + for (name, newVersion, newFlavor), (oldName, oldVersion, oldFlavor) in \ + outdated.iteritems(): + list.append((name, (oldVersion, oldFlavor), + (newVersion, newFlavor), 0)) if not list: log.warning("no new troves were found") @@ -100,6 +100,9 @@ except repository.CommitError, e: log.error(e) + if eraseList: + db.eraseTroves(eraseList, tagScript = tagScript) + def doErase(db, cfg, pkg, versionStr = None, tagScript = None): try: pkgList = db.findTrove(pkg, versionStr) From msw@specifixinc.com Tue Aug 10 17:15:14 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7ALFEbI004601 for ; Tue, 10 Aug 2004 17:15:14 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 004CB1620B for ; Tue, 10 Aug 2004 14:15:47 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7ALFjTD025298; Tue, 10 Aug 2004 17:15:45 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7ALFjpp025295; Tue, 10 Aug 2004 17:15:45 -0400 Date: Tue, 10 Aug 2004 17:15:45 -0400 From: Matt Wilson Message-Id: <200408102115.i7ALFjpp025295@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/repository Precedence: first-class Cc: Subject: conary/repository changeset.py,1.152,1.153 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 21:15:14 -0000 Update of /mnt/specifix/cvs/conary/repository In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv25283/repository Modified Files: changeset.py Log Message: check to make sure that the file on the filesystem is a regular file before checking its contents Index: changeset.py =================================================================== RCS file: /mnt/specifix/cvs/conary/repository/changeset.py,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- changeset.py 10 Aug 2004 20:40:08 -0000 1.152 +++ changeset.py 10 Aug 2004 21:15:43 -0000 1.153 @@ -458,7 +458,8 @@ fsFile = files.FileFromFilesystem(fullPath, fileId, possibleMatch = origFile) - if fsFile.contents.sha1() == origFile.contents.sha1(): + if (isinstance(fsFile, files.RegularFile) and + fsFile.contents.sha1() == origFile.contents.sha1()): # the contents in the file system are right cont = filecontents.FromFilesystem(fullPath) else: From msw@specifixinc.com Tue Aug 10 17:20:24 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7ALKObI004612 for ; Tue, 10 Aug 2004 17:20:24 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 037581620B for ; Tue, 10 Aug 2004 14:20:57 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7ALKtTD025502; Tue, 10 Aug 2004 17:20:55 -0400 Received: (from msw@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7ALKtt7025499; Tue, 10 Aug 2004 17:20:55 -0400 Date: Tue, 10 Aug 2004 17:20:55 -0400 From: Matt Wilson Message-Id: <200408102120.i7ALKtt7025499@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary/local Precedence: first-class Cc: Subject: conary/local update.py,1.120,1.121 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 21:20:24 -0000 Update of /mnt/specifix/cvs/conary/local In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv25487 Modified Files: update.py Log Message: remove extra # Index: update.py =================================================================== RCS file: /mnt/specifix/cvs/conary/local/update.py,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- update.py 10 Aug 2004 15:04:38 -0000 1.120 +++ update.py 10 Aug 2004 21:20:53 -0000 1.121 @@ -466,7 +466,7 @@ if noIds: # we don't want to merge owner/group ids in # this case (something other than owner/group - # # changed, such as size). simply take the + # changed, such as size). simply take the # head values baseFile.inode.setOwner(headFile.inode.owner()) baseFile.inode.setGroup(headFile.inode.group()) From dbc@specifixinc.com Tue Aug 10 17:39:08 2004 Received: from bluesmobile.specifixinc.com ([64.62.200.227]) by lists.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7ALd8bI004626 for ; Tue, 10 Aug 2004 17:39:08 -0400 Received: from lambchop.rdu.specifixinc.com (lambchop.rdu.specifixinc.com [172.16.58.2]) by bluesmobile.specifixinc.com (Postfix) with ESMTP id 367001675B for ; Tue, 10 Aug 2004 14:39:41 -0700 (PDT) Received: from lambchop.rdu.specifixinc.com (localhost.localdomain [127.0.0.1]) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10) with ESMTP id i7ALddTD026227; Tue, 10 Aug 2004 17:39:39 -0400 Received: (from dbc@localhost) by lambchop.rdu.specifixinc.com (8.12.10/8.12.10/Submit) id i7ALddeU026222; Tue, 10 Aug 2004 17:39:39 -0400 Date: Tue, 10 Aug 2004 17:39:39 -0400 From: David Christian Message-Id: <200408102139.i7ALddeU026222@lambchop.rdu.specifixinc.com> Content-Type: TEXT/PLAIN; charset=US-ASCII To: conary-commits@lists.specifixinc.com, synccvs@specifixinc.com X-CVS-Module: conary X-CVS-Directory: conary Precedence: first-class Cc: Subject: conary options.py, 1.9, 1.9.2.1 conary.1, 1.12, 1.12.2.1 conary.py, 1.66, 1.66.2.1 X-BeenThere: conary-commits@lists.specifixinc.com X-Mailman-Version: 2.1.5 Reply-To: conary-list@lists.specifixinc.com List-Id: commits to the Conary cvs archive List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 21:39:09 -0000 Update of /cvs/conary In directory lambchop.rdu.specifixinc.com:/tmp/cvs-serv26204 Modified Files: Tag: conary-0_6_4-branch options.py conary.1 conary.py Log Message: Add --configfile command, fix up "return usage" to "return usage()" Index: options.py =================================================================== RCS file: /cvs/conary/options.py,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- options.py 30 Jul 2004 16:34:15 -0000 1.9 +++ options.py 10 Aug 2004 21:39:37 -0000 1.9.2.1 @@ -83,6 +83,10 @@ argSet[arg] = [sys.argv[i]] i = i + 1 + if 'configfile' in argSet: + cfg.read(argSet['configfile']) + del argSet['configfile'] + if argSet.has_key('config'): for param in argSet['config']: cfg.configLine(param) Index: conary.1 =================================================================== RCS file: /cvs/conary/conary.1,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -r1.12 -r1.12.2.1 --- conary.1 5 Aug 2004 20:15:34 -0000 1.12 +++ conary.1 10 Aug 2004 21:39:37 -0000 1.12.2.1 @@ -345,9 +345,11 @@ .I $HOME/.conaryrc The configuration files for Conary; entries in \fI$HOME/.conaryrc\fR override entries in \fI/etc/conaryrc,\fR and command-line options -(including the \fB\-\-config\fR option) override both configuration -files. Conary configuration items can be strings, booleans -(\fBTrue\fP or \fBFalse\fP), or mappings (\f(BIto from\fP) and +(including the \fB\-\-config\fR option, which allows you to override +one line in the config file, and the --configfile option, which +reads in an additional, supplied config file) override both +configuration files. Conary configuration items can be strings, +booleans (\fBTrue\fP or \fBFalse\fP), or mappings (\f(BIto from\fP) and can include: .PD .RS 4 Index: conary.py =================================================================== RCS file: /cvs/conary/conary.py,v retrieving revision 1.66 retrieving revision 1.66.2.1 diff -u -r1.66 -r1.66.2.1 --- conary.py 5 Aug 2004 20:15:34 -0000 1.66 +++ conary.py 10 Aug 2004 21:39:37 -0000 1.66.2.1 @@ -77,6 +77,7 @@ print "commit flags: --target-branch " print "" print 'common flags: --build-label