← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:charm-ppa-fix-oval-data into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:charm-ppa-fix-oval-data into launchpad:master.

Commit message:
charm: Fix oval_data_root in ppa-publisher

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/455516

It was missing a "data" segment.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-ppa-fix-oval-data into launchpad:master.
diff --git a/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2 b/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2
index a0e08e8..ffd4330 100644
--- a/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2
+++ b/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2
@@ -14,7 +14,7 @@ extends: ../launchpad-db-lazr.conf
 [archivepublisher]
 archives_dir: {{ archives_dir }}
 {{- opt("oval_data_rsync_endpoint", oval_data_rsync_endpoint) }}
-oval_data_root: {{ base_dir }}/oval-data
+oval_data_root: {{ oval_data_root }}
 
 [personalpackagearchive]
 root: {{ ppa_archive_root }}