mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	standardize on versionName as spelling
This commit is contained in:
		
							parent
							
								
									1068057524
								
							
						
					
					
						commit
						bbe29abaa3
					
				
					 3 changed files with 6 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -233,7 +233,7 @@ def check_tags(app: metadata.App, pattern: str) -> tuple[str, int, str]:
 | 
			
		|||
            if verex:
 | 
			
		||||
                m = re.search(verex, filecontent)
 | 
			
		||||
                if not m:
 | 
			
		||||
                    logging.debug(f"UpdateCheckData regex {verex} for version name"
 | 
			
		||||
                    logging.debug(f"UpdateCheckData regex {verex} for versionName"
 | 
			
		||||
                                  f" has no match in tag {tag}")
 | 
			
		||||
                    continue
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2211,7 +2211,7 @@ def parse_androidmanifests(paths, app):
 | 
			
		|||
                                version = matches
 | 
			
		||||
 | 
			
		||||
                            else:
 | 
			
		||||
                                # If build.gradle contains applicationNameSuffix add it to the end of version name
 | 
			
		||||
                                # If build.gradle contains applicationNameSuffix add it to the end of versionName
 | 
			
		||||
                                matches = vnssearch_g(line)
 | 
			
		||||
                                if matches and temp_version_name:
 | 
			
		||||
                                    name_suffix = matches.group(2)
 | 
			
		||||
| 
						 | 
				
			
			@ -2294,7 +2294,7 @@ def parse_androidmanifests(paths, app):
 | 
			
		|||
        logging.debug("..got package={0}, version={1}, vercode={2}"
 | 
			
		||||
                      .format(package, version, vercode))
 | 
			
		||||
 | 
			
		||||
        # Always grab the package name and version name in case they are not
 | 
			
		||||
        # Always grab the package name and versionName in case they are not
 | 
			
		||||
        # together with the highest versionCode
 | 
			
		||||
        if max_package is None and package is not None:
 | 
			
		||||
            max_package = package
 | 
			
		||||
| 
						 | 
				
			
			@ -2610,7 +2610,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
 | 
			
		|||
 | 
			
		||||
    # Insert versionCode and number into the manifest if necessary
 | 
			
		||||
    if build.forceversion:
 | 
			
		||||
        logging.info("Changing the version name")
 | 
			
		||||
        logging.info("Changing the versionName")
 | 
			
		||||
        for path in manifest_paths(root_dir, flavors):
 | 
			
		||||
            if not os.path.isfile(path):
 | 
			
		||||
                continue
 | 
			
		||||
| 
						 | 
				
			
			@ -2950,7 +2950,7 @@ def get_apk_id(apkfile):
 | 
			
		|||
    -------
 | 
			
		||||
    appid
 | 
			
		||||
    versionCode
 | 
			
		||||
    version name
 | 
			
		||||
    versionName
 | 
			
		||||
 | 
			
		||||
    """
 | 
			
		||||
    try:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -352,7 +352,7 @@ def main():
 | 
			
		|||
        if not appid:
 | 
			
		||||
            raise FDroidException(_("Couldn't find Application ID"))
 | 
			
		||||
        if not versionName:
 | 
			
		||||
            logging.warning(_('Could not find latest version name'))
 | 
			
		||||
            logging.warning(_('Could not find latest versionName'))
 | 
			
		||||
        if not versionCode:
 | 
			
		||||
            logging.warning(_('Could not find latest versionCode'))
 | 
			
		||||
    else:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue