diff options
| author | Ajay Garg <ajay@activitycentral.com> | 2012-10-02 21:49:08 (GMT) |
|---|---|---|
| committer | Ajay Garg <ajay@activitycentral.com> | 2012-10-02 21:49:08 (GMT) |
| commit | cbc2b9cae1865b0918384f4ba1f55eb9f11cfe07 (patch) | |
| tree | fc59e762cfa34bf36a85ca167bde0a39d0f1cb61 | |
| parent | a01015f88a556f6932e9c3272d4e522750ce8754 (diff) | |
Missed removing one thing in "Disable 1-to-N feature" patch.
| -rw-r--r-- | rpms/sugar/0153-Disable-1-to-N-feature.patch | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/rpms/sugar/0153-Disable-1-to-N-feature.patch b/rpms/sugar/0153-Disable-1-to-N-feature.patch index ec97874..b671751 100644 --- a/rpms/sugar/0153-Disable-1-to-N-feature.patch +++ b/rpms/sugar/0153-Disable-1-to-N-feature.patch @@ -1,16 +1,40 @@ -From eb5aabfb30cae0725bf287a7239427287f5331e4 Mon Sep 17 00:00:00 2001 +From 073d3f9c45d4165f8814664ccd3c5e3064145ec3 Mon Sep 17 00:00:00 2001 From: Ajay Garg <ajay@activitycentral.com> -Date: Tue, 2 Oct 2012 19:09:27 +0530 +Date: Wed, 3 Oct 2012 03:17:44 +0530 Subject: [PATCH] Disable 1-to-N feature. Organization: Sugar Labs Foundation Signed-off-by: Ajay Garg <ajay@activitycentral.com> --- + src/jarabe/intro/window.py | 12 ------------ src/jarabe/journal/model.py | 2 +- src/jarabe/journal/palettes.py | 11 ----------- src/jarabe/journal/volumestoolbar.py | 1 - src/jarabe/view/buddymenu.py | 12 ------------ - 4 files changed, 1 insertions(+), 25 deletions(-) + 5 files changed, 1 insertions(+), 37 deletions(-) +diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py +index c4ae56e..df19fbf 100644 +--- a/src/jarabe/intro/window.py ++++ b/src/jarabe/intro/window.py +@@ -56,18 +56,6 @@ def create_profile(name, color=None): + else: + logging.error('Keypair exists, skip generation.') + +- # Also, generate SSL key and cert pair; to be used in secure +- # sharing of webdav entries via httpd. +- keypath = os.path.join(env.get_profile_path(), 'ssl.key') +- certpath = os.path.join(env.get_profile_path(), 'ssl.crt') +- +- cmd = 'openssl req -new -newkey rsa:1024 -days 365 -nodes ' + \ +- '-x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" ' + \ +- '-keyout %s -out %s' % (keypath, certpath) +- (s, o) = commands.getstatusoutput(cmd) +- if s != 0: +- logging.error('Could not generate ssl key and cert: %d %s', s, o) +- + + class _Page(hippo.CanvasBox): + __gproperties__ = { diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index 97ec85c..a933a7a 100644 --- a/src/jarabe/journal/model.py |