mirror of
				https://github.com/kata-containers/kata-containers.git
				synced 2025-11-04 03:29:55 +00:00 
			
		
		
		
	obs: pkglib: get_obs_pkg_release: Allow find release number in empty repo.
If we can not find a release number in a file this means it is an new repository. This could happend when upload changes for a new brach. Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
		@@ -316,12 +316,24 @@ function get_obs_pkg_release() {
 | 
				
			|||||||
	out=$(osc ${APIURL} -q co "${obs_pkg_name}" -o "${repo_dir}") || die "failed to checkout:$out"
 | 
						out=$(osc ${APIURL} -q co "${obs_pkg_name}" -o "${repo_dir}") || die "failed to checkout:$out"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	spec_file=$(find "${repo_dir}" -maxdepth 1 -type f -name '*.spec' | head -1)
 | 
						spec_file=$(find "${repo_dir}" -maxdepth 1 -type f -name '*.spec' | head -1)
 | 
				
			||||||
 | 
						# Find in specfile in Release: XX field.
 | 
				
			||||||
	release=$(grep -oP  'Release:\s+[0-9]+' "${spec_file}"  | grep -oP '[0-9]+')
 | 
						release=$(grep -oP  'Release:\s+[0-9]+' "${spec_file}"  | grep -oP '[0-9]+')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if [ -z "${release}" ]; then
 | 
						if [ -z "${release}" ]; then
 | 
				
			||||||
 | 
							# Not release number found find in "%define release XX"
 | 
				
			||||||
		release=$(grep -oP  '%define\s+release\s+[0-9]+' "${spec_file}"  | grep -oP '[0-9]+')
 | 
							release=$(grep -oP  '%define\s+release\s+[0-9]+' "${spec_file}"  | grep -oP '[0-9]+')
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						release_file=$(find "${repo_dir}" -maxdepth 1 -type f -name 'pkg-release')
 | 
				
			||||||
 | 
						if [ -z "${release}" ] && [ -f "${release_file}" ]; then
 | 
				
			||||||
 | 
							# Release still not found check pkg-release file
 | 
				
			||||||
 | 
							release=$(grep -oP '[0-9]+' ${release_file})
 | 
				
			||||||
 | 
						fi
 | 
				
			||||||
 | 
						if [ -z "${release}" ]; then
 | 
				
			||||||
 | 
							# Not release number found, this is a new repository.
 | 
				
			||||||
 | 
							release=1
 | 
				
			||||||
 | 
						fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	rm -r "${repo_dir}"
 | 
						rm -r "${repo_dir}"
 | 
				
			||||||
	echo "${release}"
 | 
						echo "${release}"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user