Merge branch 'fix/component-change' of salsa.debian.org:lyknode/debexpo into live

MR: mentors.debian.net-team/debexpo!174


Signed-off-by: Mattia Rizzolo <mattia@debian.org>

debexpo/repository/models.py

@@ -243,8 +243,8 @@ class Repository():
         for sumed_file in files_to_install:
             # Remove old entry from database
             try:
-                previous_entry = RepositoryFile.objects.get(path=join(
-                    pool_dir, str(sumed_file)))
+                previous_entry = RepositoryFile.objects.get(path__endswith=join(
+                    '/', str(sumed_file)))
             except RepositoryFile.DoesNotExist:
                 pass
             else:

tests/functional/repository/test_repository.py

@@ -226,10 +226,15 @@ class TestRepositoryController(TestController):
         self._setup_example_package()
         self._repo_install_package(**self.package)
 
+        # Change the component
+        self.package['component'] = 'non-free'
+        self._repo_install_package(**self.package)
+
         response = self.client.get(reverse('package', args=[package['name']]))
         self.assertEquals(response.status_code, 200)
-        self.assertIn('/debian/pool/main/t/testpackage/testpackage_1.0-1.dsc',
-                      str(response.content))
+        self.assertIn(
+            '/debian/pool/non-free/t/testpackage/testpackage_1.0-1.dsc',
+            str(response.content))
 
         self._remove_example_package()
         self._remove_example_user()