[backend] support buildtime in containerinfo/annotation

openSUSE · Apr 26, 2018 · 9b64cf5 · 9b64cf5
1 parent 54fcc5b
commit 9b64cf5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/backend/BSRepServer/Containerinfo.pm b/src/backend/BSRepServer/Containerinfo.pm
@@ -70,6 +70,7 @@ sub containerinfo2obsbinlnk {
   my $annotation = {};
   $annotation->{'repo'} = $d->{'repos'} if $d->{'repos'};
   $annotation->{'disturl'} = $d->{'disturl'} if $d->{'disturl'};
+  $annotation->{'buildtime'} = $d->{'buildtime'} if $d->{'buildtime'};
   if (%$annotation) {
     eval { $lnk->{'annotation'} = BSUtil::toxml($annotation, $BSXML::binannotation) };
     warn($@) if $@;
@@ -118,6 +119,7 @@ sub readcontainerinfo {
   my $file = $d->{'file'};
   $d->{'file'} = $file = undef unless defined($file) && ref($file) eq '';
   delete $d->{'disturl'} unless defined($d->{'disturl'}) && ref($d->{'disturl'}) eq '';
+  delete $d->{'buildtime'} unless defined($d->{'buildtime'}) && ref($d->{'buildtime'}) eq '';
   return undef unless defined($name) && defined($file);
   eval {
     BSVerify::verify_simple($file);

diff --git a/src/backend/BSXML.pm b/src/backend/BSXML.pm
@@ -1849,6 +1849,7 @@ our $binannotation = [
 	    'priority',
      ]],
 	'disturl',
+	'buildtime',
 	'package',		# only in build job annotation
 	'epoch',		# only in build job annotation
 	'version',		# only in build job annotation

diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -2359,7 +2359,7 @@ sub getbinaries {
       if ($buildinfo->{'containerannotation'}) {
 	my $annotation = BSUtil::fromxml($buildinfo->{'containerannotation'}, $BSXML::binannotation, 1);
 	if ($annotation) {
-	  for (qw{package version release binaryarch disturl}) {
+	  for (qw{package version release binaryarch disturl buildtime}) {
 	    $bin->{$_} = $annotation->{$_} if defined($annotation->{$_}) && $annotation->{$_} ne '';
 	  }
 	}