Changeset 61 for cmtpacman

Timestamp:

Jul 8, 2005, 4:19:29 PM (19 years ago)

Author:

garonne

Message:

correct some error message

Location:

cmtpacman/HEAD/scripts

Files:

• create_kit (modified) (1 diff)
• kit.py (modified) (14 diffs)

cmtpacman/HEAD/scripts/create_kit

@@ -17 +17 @@
 #----------------------------------------------------
 def main ():
-
-    print time.strftime ('%c')
     
     kit = Kit                   (DEBUG=True)

cmtpacman/HEAD/scripts/kit.py

@@ -23 +23 @@
 import signal
 import tarfile
+import logging
+import commands
 
 from   cmt import *
@@ -42 +44 @@
         hdlr.setFormatter(fmt)
         self.log.addHandler(hdlr)
-
+        
+        self.log.info(time.strftime ('%c'))
         # Default options 
         self.here               = os.getcwd()
@@ -133 +136 @@
         # Prepare temporary file management
         self.log.debug('CMT %s', str(os.getpid ()))
+        self.tempprefix = "/tmp/CMT"
         self.log.debug('temprefix=%s', self.tempprefix)
         self.tempfile1          = os.path.join (self.tempprefix, 't')
@@ -139 +143 @@
         self.tempcmtusercontext = os.path.join (self.tempprefix, 'd')
         self.cleanup ()
-        os.makedirs (self.tempprefix)
+        if self.tempprefix != '':
+            os.makedirs (self.tempprefix)
 ##################################################################################################            
 #-------------------------------- prepare_cmt_context -------------------------------------------#
@@ -228 +233 @@
     def prepare_temp (self):
         # Prepare the temporary copies
+        
         os.makedirs (self.tempcopydir)
+        
         copycmd = 'ln -s'
         
@@ -244 +251 @@
 ##################################################################################################
     def build_pacman (self):
-        print self.url, self.package, self.version, self.cmtpath, self.project_id, self.is_internal
+        self.log.debug("%s %s %s %s %s %s", self.url, self.package, self.version, self.cmtpath, \
+                       self.project_id, self.is_internal)
         self.source = '../kits'
         # External packages (those with export_paths) are split into two kits:
@@ -266 +274 @@
             self.pacman_filename = self.download_filename + '.pacman'
             
-            print 'build_pacman> Create pacman file for external stuff ' + self.pacman_filename
+            self.log.info ('build_pacman> Create pacman file for external stuff %s', self.pacman_filename)
             file = os.path.join (self.cache_dir, self.pacman_filename)
             self.pacman_file_version = self.get_pacman_file_version (file)
@@ -276 +284 @@
             
         # write pacman file
+        self.log.debug ('write pacman file')
         f = open (file, 'w+')
         
@@ -286 +295 @@
         f.write (content)
         f.close()
+        self.log.debug ('close file')
         
     # Figure out dependencies from CMT.
@@ -308 +318 @@
         if self.project_id == "":
             self.release_id=self.release
-            vv=os.system("`echo "+self.version+" | sed -e 's#'^"+self.package+"-'##'`")
+            cmd = "`echo "+self.version+" | sed -e 's#'^"+self.package+"-'##'`"
+            status, vv= commands.getstatusoutput(cmd)
         else:
             self.release_id=self.project_id
@@ -322 +333 @@
                 self.project_dep = "CMTCONFIG-"+self.cmtversion+self.platform_suffix
    
-        self.depends="package ('"+str(self.project_dep)+"')"
-        first=True
-        for f in self.depsv:
-            p=os.system  ("`echo "+f+" | cut -d: -f1`")
-            v=os.system  ("`echo "+f+" | cut -d: -f2`")
-            pp=os.system ("`echo "+f+" | cut -d: -f3 | sed -e 's#/$##'`")
+            self.depends="package ('"+str(self.project_dep)+"')"
+            first=True
+            for f in self.depsv:
+                p=os.system  ("`echo "+f+" | cut -d: -f1`")
+                v=os.system  ("`echo "+f+" | cut -d: -f2`")
+                pp=os.system ("`echo "+f+" | cut -d: -f3 | sed -e 's#/$##'`")
 
         # end build_pacman        
@@ -456 +467 @@
         if self.debug:
             tarball = tarfile.open (name=name , mode='r:gz')
-            self.log.debug('tar ball content:%s', str(tarball.list ())
+            self.log.debug('tar ball content:%s', str(tarball.list ()))
             tarball.close ()
 ##################################################################################################
@@ -464 +475 @@
         #  Acquire the CMT files (requirements + make_fragments) file
         #  Result is stored (symlinked) in ${tempcopydir}/cmt
-     
+        pass 
 #  echo `pwd` >${tempfile1}
 #  if test -d ../fragments; then
@@ -500 +511 @@
 #---------------------------------- transfer_files ----------------------------------------------#
 ##################################################################################################
-    def transfer_files (self, kind, list, branch):
-        alt=
-        dir_prefix=
-
-        if os.path.isfile(list): return 
+    def transfer_files (self, kind, liste, branch):
+        alt       = ""
+        dir_prefix= ""
+
+        if os.path.isfile(liste): return 
 #        
 #  cmt -quiet filter ${list} ${tempfile2}; mv ${tempfile2} ${list}