Merge lp:~brian.curtin/ubuntuone-windows-installer/win8-update into lp:ubuntuone-windows-installer

Proposed by Brian Curtin
Status: Merged
Approved by: dobey
Approved revision: 146
Merged at revision: 147
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/win8-update
Merge into: lp:ubuntuone-windows-installer
Diff against target: 27 lines (+4/-2)
1 file modified
scripts/ubuntuone.xml (+4/-2)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/win8-update
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+132133@code.launchpad.net

Commit message

- Support Windows 8 firewall commands in installer.

Description of the change

Add Windows 8 to the conditions we use for Vista/7

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/ubuntuone.xml'
2--- scripts/ubuntuone.xml 2012-09-14 20:05:56 +0000
3+++ scripts/ubuntuone.xml 2012-10-30 15:09:24 +0000
4@@ -209,9 +209,10 @@
5 <programArguments>advfirewall firewall add rule name="Ubuntu One" dir=in action=allow program="${forwardslash_installdir}\dist\ubuntuone-syncdaemon.exe" enable=yes</programArguments>
6 <ruleEvaluationLogic>or</ruleEvaluationLogic>
7 <ruleList>
8- <!-- This usage of netsh is for Vista and 7. -->
9+ <!-- This usage of netsh is for Vista, 7, and 8. -->
10 <platformTest type="windows-vista" />
11 <platformTest type="windows-7" />
12+ <platformTest type="windows-8" />
13 </ruleList>
14 </runProgram>
15 <runProgram>
16@@ -220,9 +221,10 @@
17 <programArguments>advfirewall firewall add rule name="Ubuntu One" dir=out action=allow program="${forwardslash_installdir}\dist\ubuntuone-syncdaemon.exe" enable=yes</programArguments>
18 <ruleEvaluationLogic>or</ruleEvaluationLogic>
19 <ruleList>
20- <!-- This usage of netsh is for Vista and 7. -->
21+ <!-- This usage of netsh is for Vista, 7, and 8. -->
22 <platformTest type="windows-vista" />
23 <platformTest type="windows-7" />
24+ <platformTest type="windows-8" />
25 </ruleList>
26 </runProgram>
27 <runProgram>

Subscribers

People subscribed via source and target branches