From 07eacebe69c36bc9476923ce07fe46a6a23b74a9 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Thu, 31 Aug 2017 19:55:09 +0200
Subject: [PATCH] Remove patate stuff

---
 config/config                    |  1 -
 init.sh                          |  4 ++--
 scripts/rebuildd/upload-binaries | 14 --------------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/config/config b/config/config
index d87c37b..21796b4 100644
--- a/config/config
+++ b/config/config
@@ -28,7 +28,6 @@ PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/"
 PBUILDER_RESULTS="$PBUILDER_HOME/result"
 DAILY_PACKAGES="$PBUILDER_HOME/packages/"
 REPO_DIR=/var/www/repo/debian
-PATATE_REPO_DIR=/var/www/repo/patate
 
 # Scripts
 
diff --git a/init.sh b/init.sh
index 2950a79..4a83d10 100755
--- a/init.sh
+++ b/init.sh
@@ -35,8 +35,8 @@ cp $VINAIGRETTE_HOME/config/nginx.conf /etc/nginx/sites-enabled/repo.conf
 cat $VINAIGRETTE_HOME/config/keys/$DEBSIGN_KEYID.pub | apt-key add
 cat $VINAIGRETTE_HOME/config/sources.list > /etc/apt/sources.list.d/vinaigrette.list
 
-sed -i "s/__REPO_URL__/$REPO_URL/g" > /etc/nginx/sites-enabled/repo.conf
-sed -i "s/__REPO_URL__/$REPO_URL/g" > /etc/apt/sources.list.d/vinaigrette.list
+sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/nginx/sites-enabled/repo.conf
+sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/apt/sources.list.d/vinaigrette.list
 
 echo "127.0.0.1 $REPO_URL" >> /etc/hosts
 service nginx reload
diff --git a/scripts/rebuildd/upload-binaries b/scripts/rebuildd/upload-binaries
index c904bcb..85e518c 100755
--- a/scripts/rebuildd/upload-binaries
+++ b/scripts/rebuildd/upload-binaries
@@ -46,12 +46,6 @@ if [ -z "$COMPONENT" ]; then
     exit 1
 fi
 
-# Add to patate - soon-deprecated repo
-ADD_TO_PATATE=false
-if [[ $arch == all ]] && [[ $COMPONENT == "old-stable" ]]; then
-    ADD_TO_PATATE=true
-fi
-
 echo \
 "******************************************************************************"
 echo "Adding binary package..."
@@ -62,11 +56,6 @@ include_to() {
     reprepro --waitforlock 6 -b $REPO_DIR -C $COMPONENT include $1 \
         $CHANGES_FILE > /dev/null 1>&1 || return 1
 }
-include_to_patate() {
-    echo "Adding to soon-deprecated repository in megusta..."
-    reprepro --waitforlock 6 -b $PATATE_REPO_DIR include megusta \
-        $CHANGES_FILE > /dev/null 1>&1 || return 1
-}
 
 status=0
 if include_to $CODENAME ; then
@@ -76,9 +65,6 @@ if include_to $CODENAME ; then
 else
     status=1
 fi
-if $ADD_TO_PATATE; then
-    include_to_patate || status=2
-fi
 
 if [ $status -eq 0 ]; then
     # Clean pbuilder results