mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-04 10:54:07 +00:00 
			
		
		
		
	update-source-catalog: work better when we want a variation to point at the base layer.
This commit is contained in:
		
							parent
							
								
									5456e4e5e6
								
							
						
					
					
						commit
						9b75387648
					
				
							
								
								
									
										2
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,6 +1,8 @@
 | 
			
		||||
livecd-rootfs (23.10.22) UNRELEASED; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * Undo preseeding in reset_snapd_state.
 | 
			
		||||
  * update-source-catalog: work better when we want a variation to point
 | 
			
		||||
    at the base layer.
 | 
			
		||||
 | 
			
		||||
 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 25 Aug 2023 11:44:57 +1200
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -37,12 +37,18 @@ for entry in output:
 | 
			
		||||
        if 'variations' not in template:
 | 
			
		||||
            print("Non unique id in source catalog but no variations!")
 | 
			
		||||
            sys.exit(1)
 | 
			
		||||
        for k, variation in template['variations'].items():
 | 
			
		||||
        for variation in template['variations'].values():
 | 
			
		||||
            variation['size'] = int(opts.size)
 | 
			
		||||
        entry.setdefault('variations', {}).update(template['variations'])
 | 
			
		||||
        break
 | 
			
		||||
else:
 | 
			
		||||
    # No entry with this id found, so add a new one.
 | 
			
		||||
 | 
			
		||||
    if template['variations']:
 | 
			
		||||
        for variation in template['variations'].values():
 | 
			
		||||
            if variation['path'] == opts.squashfs:
 | 
			
		||||
                variation['size'] == int(opts.size)
 | 
			
		||||
 | 
			
		||||
    template['size'] = int(opts.size)
 | 
			
		||||
    template['path'] = opts.squashfs
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user