Commits

Brett Smith  committed 5570075

Fix for conary 2.5 config

  • Participants
  • Parent commits bc88aa3

Comments (0)

Files changed (3)

File updatebot/build/build.py

 
         # Use default tmpDir when building with rMake since the specified
         # tmpDir may not exist in the build root.
-        rmakeCfg.tmpDir = conarycfg.ConaryContext.tmpDir[1]
+        rmakeCfg.resetToDefault('tmpDir')
 
         return rmakeCfg
 

File updatebot/cmdline/clientcfg.py

     """
 
     _defaultSectionType = UpdateBotClientConfigSection
+    _cfg_bases = [UpdateBotClientConfigSection]
 
     def __init__(self, readConfigFiles=False, ignoreErrors=False):
         UpdateBotConfig.__init__(self)

File updatebot/current.py

         # that have not been imported into the conary repository.
         toUpdate = set()
         toUpdateMap = {}
+
+        kernels = []
+
         for binPkg, srcPkg in self._pkgSource.binPkgMap.iteritems():
 
             # Skip updating pkg if explicitly ignored
                     toUpdate.add(srcPkg)
                     continue
 
-
+            ## DEBUG PLEASE REMOVE
+            #if 'kernel' in binPkg.getNevra():
+            #    kernels.append(binPkg)
 
             if binPkg.getNevra() not in sourceLatest:
                 log.info('UPDATING : %s' % binPkg)
                 toUpdateMap.setdefault(srcPkg, set()).add(binPkg)
                 toUpdate.add(srcPkg)
 
+        #import epdb;epdb.st()
+
         # add a source to a specific bucket, used to "promote" newer versions
         # forward.
         if self._updateId in self._cfg.addSource: