From 298f88dfda244285fe681e9787114c9da1bc7858 Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Fri, 3 Nov 2023 19:23:04 +0100 Subject: Fix deprecation warnings on Thread.getName() Closes: #1055247 --- mini-dinstall | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mini-dinstall b/mini-dinstall index e5e7d36..a7b7363 100755 --- a/mini-dinstall +++ b/mini-dinstall @@ -525,7 +525,7 @@ class IncomingDir(threading.Thread): self._reprocess_queue = {} def run(self): - self._logger.info('Created new installer thread (%s)' % self.getName()) + self._logger.info('Created new installer thread (%s)' % self.name) self._logger.info('Entering batch mode...') initial_reprocess_queue = [] initial_fucked_list = [] @@ -595,14 +595,14 @@ class IncomingDir(threading.Thread): dist = changefiledist if dist not in list(self._archivemap.keys()): raise DinstallException('Unknown distribution "%s" in "%s"' % (dist, changefilename)) - logger.debug('Installing %s in archive %s' % (changefilename, self._archivemap[dist][1].getName())) + logger.debug('Installing %s in archive %s' % (changefilename, self._archivemap[dist][1].name)) self._archivemap[dist][0].install(changefilename, changefile) if self._trigger_reindex: if doing_reprocess: - logger.debug('Waiting on archive %s to reprocess' % self._archivemap[dist][1].getName()) + logger.debug('Waiting on archive %s to reprocess' % self._archivemap[dist][1].name) self._archivemap[dist][1].wait_reprocess() else: - logger.debug('Notifying archive %s of change' % self._archivemap[dist][1].getName()) + logger.debug('Notifying archive %s of change' % self._archivemap[dist][1].name) self._archivemap[dist][1].notify() logger.debug('Finished processing %s' % changefilename) @@ -1231,7 +1231,7 @@ class ArchiveDirIndexer(threading.Thread): self._gen_release(self._arches, force) def run(self): - self._logger.info('Created new thread (%s) for archive indexer %s' % (self.getName(), self._name)) + self._logger.info('Created new thread (%s) for archive indexer %s' % (self.name, self._name)) self._logger.info('Entering batch mode...') try: self._index_all(True) @@ -1244,7 +1244,7 @@ class ArchiveDirIndexer(threading.Thread): self._logger.exception("Unhandled exception; shutting down") die_event.set() self._done_event.set() - self._logger.info('Thread "%s" exiting' % self.getName()) + self._logger.info('Thread "%s" exiting' % self.name) def _daemon_event_ispending(self): return die_event.isSet() or not self._eventqueue.empty() @@ -1627,7 +1627,7 @@ if batch_mode: # Once we've installed everything, start the indexing threads for dist in list(distributions.keys()): archive = archivemap[dist][1] - logger.debug('Starting archive %s' % archive.getName()) + logger.debug('Starting archive %s' % archive.name) archive.start() # Wait for all the indexing threads to finish; none of these ever @@ -1635,7 +1635,7 @@ for dist in list(distributions.keys()): if batch_mode: for dist in list(distributions.keys()): archive = archivemap[dist][1] - logger.debug('Waiting for archive %s to finish' % archive.getName()) + logger.debug('Waiting for archive %s to finish' % archive.name) archive.wait() else: logger.debug("Waiting for die event") @@ -1644,7 +1644,7 @@ else: incoming.wait() for dist in list(distributions.keys()): archive = archivemap[dist][1] - logger.info('Die event caught; waiting for archive %s to finish' % archive.getName()) + logger.info('Die event caught; waiting for archive %s to finish' % archive.name) archive.wait() logger.debug('Removing lock file: %s' % lockfilename) -- cgit v1.2.3