[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH] Archive .buildinfo files so we are at least collecting them now for future use.



Hi,

As an addendum to the previous, patch attached is the following:

  commit 20ef652148357a2775426a96c37f27b4a7141d72
  Author: Chris Lamb <lamby@debian.org>
  Date:   Thu Dec 22 09:37:52 2016 +0000
  
      Set a BuildinfoArchive configuration variable for security-master.
  
   config/debian-security/dak.conf | 1 +
   1 file changed, 1 insertion(+)
  
  commit f4c42208716949f8b87ae88db007aa61b682a040
  Author: Chris Lamb <lamby@debian.org>
  Date:   Thu Dec 22 09:39:20 2016 +0000
  
      Don't fail if we have not configured Dir::BuildinfoArchive.
  
   dak/process_upload.py | 3 +++
   1 file changed, 3 insertions(+)


You can also merge from the "archive-buildinfos" branch of
https://github.com/lamby/dak if that is more convenient.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby@debian.org / chris-lamb.co.uk
       `-
From 20ef652148357a2775426a96c37f27b4a7141d72 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@debian.org>
Date: Thu, 22 Dec 2016 09:37:52 +0000
Subject: [PATCH 1/2] Set a BuildinfoArchive configuration variable for
 security-master.

---
 config/debian-security/dak.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index f342a55d0..f2c0eedf3 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -146,6 +146,7 @@ Dir
   TempPath "/srv/security-master.debian.org/tmp";
   Done "/srv/security-master.debian.org/queue/done/";
   Reject "/srv/security-master.debian.org/queue/reject/";
+  BuildinfoArchive "/srv/security-master.debian.org/buildinfo/";
 
   Queue
   {
-- 
2.11.0

From f4c42208716949f8b87ae88db007aa61b682a040 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@debian.org>
Date: Thu, 22 Dec 2016 09:39:20 +0000
Subject: [PATCH 2/2] Don't fail if we have not configured
 Dir::BuildinfoArchive.

---
 dak/process_upload.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 3c055ba79..51104523f 100755
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -497,6 +497,9 @@ def process_changes(changes_filenames):
 def process_buildinfos(upload):
     cnf = Config()
 
+    if not cnf.has_key('Dir::BuildinfoArchive'):
+        return
+
     target_dir = os.path.join(
         cnf['Dir::BuildinfoArchive'],
         datetime.datetime.now().strftime('%Y/%m/%d'),
-- 
2.11.0


Reply to: