mirror of
				https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
				synced 2025-11-04 10:34:05 +00:00 
			
		
		
		
	Re-order parsing of suites to avoid changing binary pkgs
In the next commit, the binary packages will be turned into namedtuples and will become immutable objects. Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
		
							parent
							
								
									c4e7596837
								
							
						
					
					
						commit
						7230cd29c0
					
				@ -291,7 +291,6 @@ class Britney(object):
 | 
			
		||||
        self.binaries['pu'] = {}
 | 
			
		||||
 | 
			
		||||
        for arch in self.options.architectures:
 | 
			
		||||
            self.binaries['testing'][arch] = self.read_binaries(self.options.testing, "testing", arch)
 | 
			
		||||
            self.binaries['unstable'][arch] = self.read_binaries(self.options.unstable, "unstable", arch)
 | 
			
		||||
            self.binaries['tpu'][arch] = self.read_binaries(self.options.tpu, "tpu", arch)
 | 
			
		||||
            if hasattr(self.options, 'pu'):
 | 
			
		||||
@ -301,6 +300,9 @@ class Britney(object):
 | 
			
		||||
                # properly initialised, so insert two empty dicts
 | 
			
		||||
                # here.
 | 
			
		||||
                self.binaries['pu'][arch] = ({}, {})
 | 
			
		||||
            # Load testing last as some live-data tests have more complete information in
 | 
			
		||||
            # unstable
 | 
			
		||||
            self.binaries['testing'][arch] = self.read_binaries(self.options.testing, "testing", arch)
 | 
			
		||||
 | 
			
		||||
        self.log("Compiling Installability tester", type="I")
 | 
			
		||||
        self._build_installability_tester(self.options.architectures)
 | 
			
		||||
@ -351,8 +353,7 @@ class Britney(object):
 | 
			
		||||
            raise ValueError("Invalid data set")
 | 
			
		||||
 | 
			
		||||
        # Merge ESSENTIAL if necessary
 | 
			
		||||
        if pkg_entry2[ESSENTIAL]:
 | 
			
		||||
            pkg_entry1[ESSENTIAL] = True
 | 
			
		||||
        assert pkg_entry1[ESSENTIAL] or not pkg_entry2[ESSENTIAL]
 | 
			
		||||
 | 
			
		||||
    def __parse_arguments(self):
 | 
			
		||||
        """Parse the command line arguments
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user