summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-12-18 20:17:36 (GMT)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-06 12:23:16 (GMT)
commitb2f54907063d51c7d34097392b497357eb6d116b (patch)
treea70671bfd5121ecb606396b0355a2feef5ff1101
parenta5aaa426ad49246015e2b995ffa2ba9f9f9a791f (diff)
downloadopen-build-service-b2f54907063d51c7d34097392b497357eb6d116b.tar.gz
open-build-service-b2f54907063d51c7d34097392b497357eb6d116b.tar.xz
Pass --ignore=conflictingarchall as well as --ignore=updatedarchall
Collabora versions of reprepro used updatedarchall, but the author of reprepro prefers a different approach which uses a different name (conflictingarchall). Pass both options, and also --ignore=ignore to ignore the other (unsupported) one, so that we're compatible either way. Bug: Collabora #397 Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
-rwxr-xr-xsrc/backend/bs_publish2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
index 94f8f48..93ba1bb 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -557,8 +557,10 @@ sub updaterepo_reprepro {
foreach my $type (keys %types) {
qsystem ('reprepro', '-b', $repo,
+ '--ignore=ignore',
'--ignore=wrongdistribution',
'--ignore=updatedarchall',
+ '--ignore=conflictingarchall',
'--ignore=unusedarch',
'-T', $type,
'-C', $component,