Djam/abf-console-client-src
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/abf-console-client-src.git synced 2025-02-23 09:52:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://abf.rosalinux.ru/soft/abf-console-client

Browse source
This commit is contained in:
Denis Silakov 2018-12-17 17:54:53 +03:00
commit 67e40543a2
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
abf/console/misc.py
View file

@ -85,6 +85,14 @@ def get_project_name_version(spec_path):
except:
return None
def get_rpm_source_dir():
try:
rpm = __import__('rpm') # it's initialization is too long to place it to the top of the file
ts = rpm.TransactionSet()
return rpm.expandMacro("%{_sourcedir}")
except:
return None
def get_project_data(spec_path):
rpm = __import__('rpm') # it's initialization is too long to place it to the top of the file
ts = rpm.TransactionSet()
@ -235,7 +243,7 @@ def find_spec_problems(exit_on_error=True, strict=False, auto_remove=False):
except yaml.composer.ComposerError as ex:
log.error(_('Invalid yml file %(file)s!\n%(exception)s') % {'file': yaml_path, 'exception': ex})
if not 'sources' in yaml_data:
if not yaml_data or not 'sources' in yaml_data:
log.error(_("Incorrect .abf.yml file: no 'sources' key"))
exit(1)
for fl in yaml_data['sources']:
@ -457,7 +465,7 @@ def is_text_file(path):
def fetch_files(models, yaml_path, file_names=None):
with open(yaml_path, 'r') as fd:
yaml_data = yaml.load(fd)
if not 'sources' in yaml_data:
if not yaml_data or not 'sources' in yaml_data:
log.error(_("Incorrect .abf.yml file: no 'sources' key."))
exit(1)
yaml_files = yaml_data['sources']
@ -488,6 +496,7 @@ def upload_files(models, min_size, path=None, remove_files=True, upload_all=Fals
spec_path = find_spec(path)
dir_path = os.path.dirname(spec_path)
errors_count = 0
rpm_src_dir = get_rpm_source_dir()
yaml_path = os.path.join(dir_path, '.abf.yml')
yaml_file_changed = False
@ -501,7 +510,7 @@ def upload_files(models, min_size, path=None, remove_files=True, upload_all=Fals
log.error(_('Could not parse .abf.yml file. It seems to be corrupted and will be rewritten.'))
yaml_file_changed = True
yaml_data['sources'] = {}
if not 'sources' in yaml_data:
if not yaml_data or not 'sources' in yaml_data:
log.error(_("Incorrect .abf.yml file: no 'sources' key. The file will be rewritten."))
yaml_file_changed = True
yaml_data['sources'] = {}
@ -527,6 +536,8 @@ def upload_files(models, min_size, path=None, remove_files=True, upload_all=Fals
do_not_upload = False
source = os.path.join(dir_path, src)
if not os.path.exists(source) and os.path.exists(os.path.join(rpm_src_dir, src)):
source = os.path.join(rpm_src_dir, src)
if not os.path.exists(source):
if is_url: