Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/fix_628160 into lp:ubuntuone-windows-installer/beta

  1. fix_628160
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rick McBride
Approved revision: 96
Merged at revision: 96
Proposed branch: lp:~mandel/ubuntuone-windows-installer/fix_628160
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/fix_help_space
Diff against target: 29 lines (+8/-0)
2 files modified
install/UbuntuOne7.wxs (+4/-0)
install/UbuntuOneXP.wxs (+4/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/fix_628160
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
John Lenton (community) Approve
Review via email: mp+37656@code.launchpad.net

Description of the change

Fixes lp:628160 by telling the user the need to reboot the machine.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Rick McBride (rmcbride) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install/UbuntuOne7.wxs'
2--- install/UbuntuOne7.wxs 2010-10-05 19:52:40 +0000
3+++ install/UbuntuOne7.wxs 2010-10-05 19:52:41 +0000
4@@ -1037,6 +1037,10 @@
5 <ComponentRef Id="Newtonsoft.Json" />
6 </Feature>
7
8+ <InstallExecuteSequence>
9+ <ScheduleReboot After='InstallFinalize' />
10+ </InstallExecuteSequence>
11+
12 <UI Id="WixUI_Minimal_No_License">
13 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
14 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
15
16=== modified file 'install/UbuntuOneXP.wxs'
17--- install/UbuntuOneXP.wxs 2010-10-05 19:52:40 +0000
18+++ install/UbuntuOneXP.wxs 2010-10-05 19:52:41 +0000
19@@ -809,6 +809,10 @@
20 <ComponentRef Id="Newtonsoft.Json" />
21 </Feature>
22
23+ <InstallExecuteSequence>
24+ <ScheduleReboot After='InstallFinalize' />
25+ </InstallExecuteSequence>
26+
27 <UI Id="WixUI_Minimal_No_License">
28 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
29 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />

Subscribers

People subscribed via source and target branches

to all changes: