the-distro/ofborg
2
0
Fork 1
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity

request-id is not optional now

Browse source
This commit is contained in:
Graham Christensen 2018-08-09 15:37:52 -04:00
parent 17f9a17f6a
commit 30de4a7927
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ofborg/src/message/buildresult.rs
View file

@ -17,7 +17,7 @@ pub struct BuildResult {
pub system: String,
pub output: Vec<String>,
pub attempt_id: String,
pub request_id: Option<String>,
pub request_id: String,
pub success: Option<bool>, // replaced by status
pub status: Option<BuildStatus>,
pub skipped_attrs: Option<Vec<String>>,

6
ofborg/src/tasks/build.rs
View file

@ -118,7 +118,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
system: self.system.clone(),
output: vec![String::from("Merge failed")],
attempt_id: self.attempt_id.clone(),
request_id: Some(self.job.request_id.clone()),
request_id: self.job.request_id.clone(),
attempted_attrs: None,
skipped_attrs: None,
status: Some(BuildStatus::Failure),
@ -202,7 +202,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
system: self.system.clone(),
output: self.log_snippet(),
attempt_id: self.attempt_id.clone(),
request_id: Some(self.job.request_id.clone()),
request_id: self.job.request_id.clone(),
skipped_attrs: Some(not_attempted_attrs),
attempted_attrs: None,
status: None,
@ -243,7 +243,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
system: self.system.clone(),
output: self.log_snippet(),
attempt_id: self.attempt_id.clone(),
request_id: Some(self.job.request_id.clone()),
request_id: self.job.request_id.clone(),
status: Some(status),
success: Some(success),
attempted_attrs: Some(attempted_attrs),