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

Proposed by dobey on 2013-05-23
Status: Merged
Approved by: dobey on 2013-05-23
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) 2013-05-23 Approve on 2013-05-23
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.
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
1=== removed file 'postinst'
2--- postinst 2012-08-22 14:16:02 +0000
3+++ postinst 1970-01-01 00:00:00 +0000
4@@ -1,17 +0,0 @@
5-#!/bin/sh
6-
7-set -e
8-
9-MOZ_CA_VALICERT="/usr/share/ca-certificates/mozilla/ValiCert_Class_2_VA.crt"
10-USP_VALICERT_PATH="/etc/ssl/certs/UbuntuOne-ValiCert_Class_2_VA.pem"
11-USP_VALICERT_DIR="/tmp/usp-valicert"
12-
13-if [ ! -e $MOZ_CA_VALICERT ]; then
14- if [ -d $USP_VALICERT_DIR ]; then
15- cp -pf $USP_VALICERT_DIR/ValiCert_Class_2_VA.crt $MOZ_CA_VALICERT
16- rm -rf $USP_VALICERT_DIR
17- elif [ -e $USP_VALICERT_PATH ]; then
18- cp -pf $USP_VALICERT_PATH $MOZ_CA_VALICERT
19- fi
20-fi
21-
22
23=== removed file 'postrm'
24--- postrm 2012-08-22 14:16:02 +0000
25+++ postrm 1970-01-01 00:00:00 +0000
26@@ -1,15 +0,0 @@
27-#!/bin/sh
28-
29-set -e
30-
31-MOZ_CA_VALICERT="/usr/share/ca-certificates/mozilla/ValiCert_Class_2_VA.crt"
32-USP_VALICERT_PATH="/etc/ssl/certs/UbuntuOne-ValiCert_Class_2_VA.pem"
33-USP_VALICERT_DIR="/tmp/usp-valicert"
34-
35-if [ ! -e $MOZ_CA_VALICERT ]; then
36- if [ -d $USP_VALICERT_DIR ]; then
37- cp -pf $USP_VALICERT_DIR/ValiCert_Class_2_VA.crt $MOZ_CA_VALICERT
38- rm -rf $USP_VALICERT_DIR
39- fi
40-fi
41-
42
43=== removed file 'prerm'
44--- prerm 2012-08-22 14:16:02 +0000
45+++ prerm 1970-01-01 00:00:00 +0000
46@@ -1,12 +0,0 @@
47-#!/bin/sh
48-
49-set -e
50-
51-MOZ_CA_VALICERT="/usr/share/ca-certificates/mozilla/ValiCert_Class_2_VA.crt"
52-USP_VALICERT_DIR="/tmp/usp-valicert"
53-
54-if [ -e $MOZ_CA_VALICERT ]; then
55- mkdir -p $USP_VALICERT_DIR
56- cp -pf $MOZ_CA_VALICERT $USP_VALICERT_DIR
57-fi
58-

Subscribers

People subscribed via source and target branches

to all changes: