Merge lp:~dobey/ubuntuone-storage-protocol/pkg-no-certs into lp:ubuntuone-storage-protocol/packaging-dailies

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~dobey/ubuntuone-storage-protocol/pkg-no-certs
Merge into: lp:ubuntuone-storage-protocol/packaging-dailies
Diff against target: 58 lines (+0/-44)
3 files modified
postinst (+0/-17)
postrm (+0/-15)
prerm (+0/-12)
To merge this branch: bzr merge lp:~dobey/ubuntuone-storage-protocol/pkg-no-certs
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+165474@code.launchpad.net

Commit message

Remove the post/pre scripts as we don't ship certs here any longer.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

looks good on quick scan

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'postinst'
--- postinst 2012-08-22 14:16:02 +0000
+++ postinst 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
1#!/bin/sh
2
3set -e
4
5MOZ_CA_VALICERT="/usr/share/ca-certificates/mozilla/ValiCert_Class_2_VA.crt"
6USP_VALICERT_PATH="/etc/ssl/certs/UbuntuOne-ValiCert_Class_2_VA.pem"
7USP_VALICERT_DIR="/tmp/usp-valicert"
8
9if [ ! -e $MOZ_CA_VALICERT ]; then
10 if [ -d $USP_VALICERT_DIR ]; then
11 cp -pf $USP_VALICERT_DIR/ValiCert_Class_2_VA.crt $MOZ_CA_VALICERT
12 rm -rf $USP_VALICERT_DIR
13 elif [ -e $USP_VALICERT_PATH ]; then
14 cp -pf $USP_VALICERT_PATH $MOZ_CA_VALICERT
15 fi
16fi
17
180
=== removed file 'postrm'
--- postrm 2012-08-22 14:16:02 +0000
+++ postrm 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1#!/bin/sh
2
3set -e
4
5MOZ_CA_VALICERT="/usr/share/ca-certificates/mozilla/ValiCert_Class_2_VA.crt"
6USP_VALICERT_PATH="/etc/ssl/certs/UbuntuOne-ValiCert_Class_2_VA.pem"
7USP_VALICERT_DIR="/tmp/usp-valicert"
8
9if [ ! -e $MOZ_CA_VALICERT ]; then
10 if [ -d $USP_VALICERT_DIR ]; then
11 cp -pf $USP_VALICERT_DIR/ValiCert_Class_2_VA.crt $MOZ_CA_VALICERT
12 rm -rf $USP_VALICERT_DIR
13 fi
14fi
15
160
=== removed file 'prerm'
--- prerm 2012-08-22 14:16:02 +0000
+++ prerm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1#!/bin/sh
2
3set -e
4
5MOZ_CA_VALICERT="/usr/share/ca-certificates/mozilla/ValiCert_Class_2_VA.crt"
6USP_VALICERT_DIR="/tmp/usp-valicert"
7
8if [ -e $MOZ_CA_VALICERT ]; then
9 mkdir -p $USP_VALICERT_DIR
10 cp -pf $MOZ_CA_VALICERT $USP_VALICERT_DIR
11fi
12

Subscribers

People subscribed via source and target branches

to all changes: