From 5e92a26d73ec3e665d734346c86c35fbc5909be8 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Fri, 26 Apr 2019 22:54:18 -0400
Subject: [PATCH] apt: fixed test error

---
 helpers/make-apt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/helpers/make-apt b/helpers/make-apt
index 93c593fc..0e5350c2 100644
--- a/helpers/make-apt
+++ b/helpers/make-apt
@@ -31,8 +31,8 @@ replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "h
 replace ubuntu-keyring trisquel-keyring .
 replace ubuntu-archive-keyring trisquel-archive-keyring .
 
-# hack, use special words to avoid duplicates in the test
-sed 's/contrib/uncomon/g; s/non-free/rare/g' -i test/libapt/cdromfindpackages_test.cc
+# hack, preserve this test untouched
+cp test/libapt/cdromfindpackages_test.cc /tmp
 # remove non-free examples https://trisquel.info/en/issues/5518
 sed '/non-free/d' -i ./test/integration/Packages-ubuntu-bug-614993 ./test/integration/status-ubuntu-bug-614993
 replace "contrib main non-free" main .
@@ -47,6 +47,8 @@ replace contrib universe doc
 replace contrib universe po
 replace non-free main .
 
+cp /tmp/cdromfindpackages_test.cc test/libapt
+
 # Ubuntu link to changelogs https://trisquel.info/en/issues/9967 
 replace "http://changelogs.ubuntu.com/changelogs" "http://packages.trisquel.info/changelogs" .
 replace changelogs.ubuntu.com packages.trisquel.info .
-- 
GitLab