mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	Merge branch 'version_unknown' into 'master'
[checkupdates] Use tag if version is 'Unknown' See merge request fdroid/fdroidserver!970
This commit is contained in:
		
						commit
						958fd17232
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -207,6 +207,8 @@ def check_tags(app, pattern):
 | 
			
		|||
                    root_dir = build_dir / subdir
 | 
			
		||||
                    paths = common.manifest_paths(root_dir, last_build.gradle)
 | 
			
		||||
                    version, vercode, _package = common.parse_androidmanifests(paths, app)
 | 
			
		||||
                    if version == 'Unknown' or version == 'Ignore':
 | 
			
		||||
                        version = tag
 | 
			
		||||
                    if vercode:
 | 
			
		||||
                        logging.debug("Manifest exists in subdir '{0}'. Found version {1} ({2})"
 | 
			
		||||
                                      .format(subdir, version, vercode))
 | 
			
		||||
| 
						 | 
				
			
			@ -463,8 +465,6 @@ def checkupdates_app(app):
 | 
			
		|||
    if mode.startswith('Tags'):
 | 
			
		||||
        pattern = mode[5:] if len(mode) > 4 else None
 | 
			
		||||
        (version, vercode, tag) = check_tags(app, pattern)
 | 
			
		||||
        if version == 'Unknown':
 | 
			
		||||
            version = tag
 | 
			
		||||
        msg = vercode
 | 
			
		||||
    elif mode == 'RepoManifest':
 | 
			
		||||
        (version, vercode) = check_repomanifest(app)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue