Merge lp:~robru/phablet-tools/dont-delete-silos into lp:phablet-tools

[Robert Bruce Park]

Don't delete PPAs because this breaks ppa-purge. (LP: #1333184)

[Sergio Schvezov (sergiusens)]

looks good to me; we can top approve once someone acks on testing

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/344/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/25/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/344/rebuild

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

Haha, no Jenkins, you can't pep8 my shell script! Looks like trunk is a little sloppy right now ;-)

[Robert Bruce Park (robru)]

I tested this myself, does that count?

review: Approve

[Michał Sawicz (saviq)]

Yes please!

review: Approve

[Michał Sawicz (saviq)]

Tested, works fine.

=== modified file 'citrain'
--- citrain	2014-05-28 12:56:04 +0000
+++ citrain	2014-06-24 18:12:38 +0000
@@ -64,8 +64,6 @@
         wget -qO- $HTTP/$SILO/$SOURCES \
             | perl -ne 's/,//g; s/^Binary: // && print' \
             | xargs --verbose sudo apt-get install --yes
-        sudo rm -rf /etc/apt/sources.list.d/ci-train*
-        sudo apt-get update -qq
         ;;
 
     device-install)
@@ -81,8 +79,6 @@
         sudo add-apt-repository $PPA/$SILO
         sudo apt-get update -qq
         sudo apt-get dist-upgrade --yes
-        sudo rm -rf /etc/apt/sources.list.d/ci-train*
-        sudo apt-get update -qq
         ;;
 
     device-upgrade)