Resolve aliases when rejecting changes files

1 files changed, 7 insertions, 5 deletions

diff --git a/mini-dinstall b/mini-dinstall
index 84e8d7f..347b4c1 100755
--- a/mini-dinstall
+++ b/mini-dinstall
@@ -584,7 +584,7 @@ class IncomingDir(threading.Thread):
             return False
         return True
 
-    def _install_changefile(self, changefilename, changefile, doing_reprocess):
+    def _get_dist_from_changefile(self, changefile, changefilename):
         changefiledist = changefile['distribution']
         for dist in list(distributions.keys()):
             distributions[dist] = distoptionhandler.get_option_map(dist)
@@ -595,7 +595,11 @@ 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].name))
+        return dist
+
+    def _install_changefile(self, changefilename, changefile, doing_reprocess):
+        dist = self._get_dist_from_changefile(changefile, changefilename)
+        logger.debug('Installing %s in archive %s' % (changefilename, self._archivemap[dist][1].getName()))
         self._archivemap[dist][0].install(changefilename, changefile)
         if self._trigger_reindex:
             if doing_reprocess:
@@ -607,9 +611,7 @@ class IncomingDir(threading.Thread):
             logger.debug('Finished processing %s' % changefilename)
 
     def _reject_changefile(self, changefilename, changefile, e):
-        dist = changefile['distribution']
-        if dist not in self._archivemap:
-            raise DinstallException('Unknown distribution "%s" in "%s"' % (dist, changefilename))
+        dist = self._get_dist_from_changefile(changefile, changefilename)
         self._archivemap[dist][0].reject(changefilename, changefile, e)
 
     def _daemon_server_isready(self):