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 18:02:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some tabs replaced with spaces.

Browse source
This commit is contained in:
Mikhail Terekhov 2017-03-11 18:02:31 -05:00
parent 41a1da8e53
commit ae53d885c9
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
abf.py
View file

@ -152,8 +152,8 @@ def parse_command_line():
'Default is 0B.'))
subparser.add_argument('-n', '--do-not-remove-files', action='store_true', help=_('By default files are being removed on uploading. Override this behavior.'))
subparser.add_argument('-a', '--upload-all', action='store_true', help=_('By default, console client analyzes spec file and tries to detect which files located in the '
'current folder are really used by the project and uploads only these files to file store. '
'With this option, console client will upload all binary files located in the current folder.'))
'current folder are really used by the project and uploads only these files to file store. '
'With this option, console client will upload all binary files located in the current folder.'))
subparser.set_defaults(func=put)
# store

42
abf/model.py
View file

@ -436,7 +436,7 @@ class Project(Model):
@staticmethod
def update(models, project, name, description, visibility, is_package, default_branch,
has_issues, has_wiki, publish_i686_into_x86_64, maintainer_id):
has_issues, has_wiki, publish_i686_into_x86_64, maintainer_id):
DATA = {
'id': project.id,
'name': name,
@ -539,12 +539,12 @@ class BuildList(Model):
self.params_dict['chroot_tree'] = ''
if self.init_data['logs']:
self.params_dict['log_url'] = self.init_data['logs'][0]['url'] + '.log?show=True'
for log in self.init_data['logs']:
if log["file_name"] == "chroot-tree.log":
self.params_dict["chroot_tree"] = log["url"] + '.log?show=True'
self.params_dict['log_url'] = self.init_data['logs'][0]['url'] + '.log?show=True'
for log in self.init_data['logs']:
if log["file_name"] == "chroot-tree.log":
self.params_dict["chroot_tree"] = log["url"] + '.log?show=True'
else:
self.params_dict['log_url'] = ''
self.params_dict['log_url'] = ''
self.params_dict['status_string'] = BuildList.status_by_id[self.params_dict['status']]
if self.params_dict['status'] in BuildList.final_statuses:
@ -562,21 +562,21 @@ class BuildList(Model):
auto_publish_statuses = ['default', 'none', 'testing']
@staticmethod
def new_build_task(models,
project,
save_to_repository,
repositories,
commit_hash,
project_version,
update_type,
auto_publish_status,
arches, skip_personal,
cached_chroot,
save_chroot,
auto_create_container,
include_testing_subrepo,
use_extra_tests,
extra_build_lists,
external_nodes):
project,
save_to_repository,
repositories,
commit_hash,
project_version,
update_type,
auto_publish_status,
arches, skip_personal,
cached_chroot,
save_chroot,
auto_create_container,
include_testing_subrepo,
use_extra_tests,
extra_build_lists,
external_nodes):
if external_nodes == 'none':
DATA = {
'project_id': project.id,