Skip to content

Commit

Permalink
Merge pull request #1280 from adrianschroeter/publish_state
Browse files Browse the repository at this point in the history
Publish state
  • Loading branch information
adrianschroeter committed Oct 21, 2015
2 parents 9d17366 + 2b96dc3 commit f33cc78
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/api/app/helpers/webui/webui_helper.rb
Expand Up @@ -152,11 +152,11 @@ def arch_repo_table_cell(repo, arch, package_name)
'building' => 'Build jobs exists',
'finished' => 'Build jobs have been processed, new repository is not yet created',
'blocked' => 'No build possible atm, waiting for jobs in other repositories',
'broken' => 'The repository setup is broken, build not possible',
'broken' => 'The repository setup is broken, build or publish not possible',
'scheduling' => 'The repository state is being calculated right now'
}

def repo_status_icon(status)
def repo_status_icon(status, details = nil)
icon = REPO_STATUS_ICONS[status] || 'eye'

outdated = nil
Expand All @@ -167,6 +167,7 @@ def repo_status_icon(status)

description = REPO_STATUS_DESCRIPTIONS[status] || 'Unknown state of repository'
description = 'State needs recalculations, former state was: ' + description if outdated
description += " (" + details + ")" if details

sprite_tag icon, title: description
end
Expand Down
5 changes: 4 additions & 1 deletion src/backend/bs_sched
Expand Up @@ -9503,7 +9503,10 @@ NEXTPRP:
print " publishing is disabled\n";
}
writestr("$reporoot/$prp/$myarch/:repodone", undef, $repodonestate) unless $publisherror || %unfinished;
$schedulerdetails = $publisherror if $publisherror;
if ($publisherror) {
$schedulerstate = "broken";
$schedulerdetails = $publisherror;
}
}
if (!%unfinished && !$publisherror) {
$prpfinished{$prp} = 1;
Expand Down

0 comments on commit f33cc78

Please sign in to comment.