Commits

Anonymous committed b1d936c

Clean up old debugging code

Comments (0)

Files changed (4)

         else:
             trvMap = self._builder.buildsplitarch(buildTroves)
 
+        # Updates for centos 5 unencap require grpbuild and promote
+        if self._cfg.updateMode == 'latest' and self._cfg.platformName == 'centos':
+            # Build group.
+            grpTrvs = (self._cfg.topSourceGroup, )
+            grpTrvMap = self._builder.build(grpTrvs)
 
-        log.info("Proceed to build groups")
-
-        # Build group.
-        grpTrvs = (self._cfg.topSourceGroup, )
-        grpTrvMap = self._builder.build(grpTrvs)
-
-        # Promote group.
-        # We expect that everything that was built will be published.
-        expected = self._flattenSetDict(trvMap)
-        toPublish = self._flattenSetDict(grpTrvMap)
-        newTroves = self._updater.publish(toPublish, expected,
+            # Promote group.
+            # We expect that everything that was built will be published.
+            expected = self._flattenSetDict(trvMap)
+            toPublish = self._flattenSetDict(grpTrvMap)
+            newTroves = self._updater.publish(toPublish, expected,
                                               self._cfg.targetLabel)
 
-        # Mirror out what we have done
-        self._updater.mirror()
+            # Disabled handled in seperate job
+            # Mirror out what we have done
+            #self._updater.mirror()
 
         if not self._cfg.disableAdvisories:
             # Send advisories.

updatebot/build/dispatcher.py

                 self._promoteSlots -= 1
                 self._promoter.promoteJob(toPromote)
 
-        # If anything has been promoting for more than 10 minutes, let us poke
-        # around and figure out why.
-        #toRemove = set()
-        #for jobId, startTime in self._status.iteritems():
-        #    if time.time() - startTime > (60 * 20):
-        #        log.info('JobId ID: %s' % jobId)
-                #log.info('Completely silly promote times have been reached')
-        #        if time.time() - startTime > (60 * 40):
-        #            log.info('Ok ludicrous promote times reached %s' % jobId)
-        #            log.warn('JobId info: %s' % str(self._jobs[jobId]))
-        #            for job in self._jobs:
-        #                if self._jobs[job][1] != -11:
-        #                    log.warn('Waiting on job status for  %s : %s ' % 
-        #                                (job,self._jobs[job][1])) 
-        #                    if time.time() - startTime > (60 * 80):
-        #                        import epdb; epdb.st()
-                    #if self._jobs[jobId][1] == -11 and jobId not in toRemove:
-                        #toRemove.add(jobId)
-        #for jobId in toRemove:
-        #    self._status.pop(jobId, None)
-
         # Gather results
         for result in self._promoter.getStatus():
             log.warn('WE GOT RESULTS FROM PROMOTER')

updatebot/current.py

                 if nvf not in targetClonedFrom:
                     toPromote.add(nvf)
 
-        #import epdb;epdb.st()
-
-
         return toPromote
 
     def _getUpdatePackages(self):
                 toUpdateMap.setdefault(srcPkg, set()).add(binPkg)
                 toUpdate.add(srcPkg)
 
-            #if binPkg.name in [ 'qcairo', 'celt051', 'qpixman', 'qcairo-devel', 
-            #                       'celt051-devel', 'qpixman-devel' ]:
-            #   import epdb;epdb.st()
-
-
         # add a source to a specific bucket, used to "promote" newer versions
         # forward.
         if self._updateId in self._cfg.addSource:
             for updateSet in updatePkgs:
                 log.info('building set of update troves')
 
-                #updateTroves = set([ (self._getPreviousNVFForSrcPkg(x), x)
-                #    for x in updateSet])
-
                 log.info('running update')
 
                 log.info('WORKING ON %s UPDATES' % len(updateSet))
 
-                #DEBUG RHEL5CLIENT
-                log.warn('DEBUG THREADING')
-                #import epdb;epdb.st()
-
                 chunks = 1
 
                 chunk = lambda ulist, step:  map(lambda i: ulist[i:i+step],
                         for x in upSet])
 
 
-                    #import epdb;epdb.st()
-
                     pkgMap.update(self._update(*args, updateTroves=updateTroves,
                         updatePkgs=True, expectedRemovals=expectedRemovals,
                         keepRemovedPackages=keepRemoved,
                         **kwargs))
 
-                    #import epdb;epdb.st()
-
-                # HACK FOR RHEL 5 CLIENT
-
                 # The NEVRA maps will be changing every time through. Make sure
                 # the clear the cache.
                 log.info('dumping conaryhelper cache')
                 rem = toAdd.pop(newPkgs[name])
                 removedPkgs.append((name, rem))
 
-        import epdb;epdb.st()
-
         ##
         # Remove any packages that were flagged for removal.
         ##
         # For debuging
         self._updateId = updateId
         log.info('UpdateID is %s' % self._updateId)
-        import epdb;epdb.st()
-
 
         # Figure out what packages still need to be promoted.
         promotePkgs = self._getPromotePackages()
         # same day...
         version = time.strftime('%Y.%m.%d_%H%M.%S', time.gmtime(time.time()))
 
-        #import epdb;epdb.st()
-
         # Build groups.
         log.info('setting version %s' % version)
         group.version = version

updatebot/update.py

                 troves.append(((name, version, flavor), latestSrpm))
 
         log.info('found %s protentially updatable troves' % len(troves))
+        import epdb;epdb.st()
         return troves
 
     def getSourceVersions(self):