mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	remove last maven: quirks and make it always a string
				
					
				
			It turns out that the maven: field was originally declared as a TYPE_STRING,
given that it was not given a different type in metadata.py's 	flagtypes.
The code was confused because it was given a default value of `False` rather
than `None` as the rest of the TYPE_STRING fields have.
This construct in build.py means maven: should always be a string:
        if '@' in build.maven:
            maven_dir = os.path.join(root_dir, build.maven.split('@', 1)[1])
        else:
            maven_dir = root_dir
			
			
This commit is contained in:
		
							parent
							
								
									a107e810d4
								
							
						
					
					
						commit
						ad960c6ecd
					
				
					 7 changed files with 120 additions and 114 deletions
				
			
		| 
						 | 
				
			
			@ -58,6 +58,7 @@ metadata_v0:
 | 
			
		|||
    - ../tests/dump_internal_metadata_format.py
 | 
			
		||||
    - sed -i
 | 
			
		||||
          -e "/buildozer/d"
 | 
			
		||||
          -e 's,maven\(\W\) false,maven\1 null,'
 | 
			
		||||
          metadata/dump_*/*.yaml
 | 
			
		||||
    - diff -uw metadata/dump_*
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue