Ubuntu One Windows Installer

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

  1. fix_updater_checksum
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rick McBride
Approved revision: 70
Merged at revision: 78
Proposed branch: lp:~mandel/ubuntuone-windows-installer/fix_updater_checksum
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/remove_license
Diff against target: 200 lines (+5/-96)
3 files modified
install/UbuntuOne.wxs (+0/-90)
main.build (+2/-2)
utils/upload_new_update.py (+3/-4)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/fix_updater_checksum
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
Stuart Colville (community) Approve
Review via email: mp+34398@code.launchpad.net

Description of the change

Ensures that the python code returns the same checksum as the c# code.

To post a comment you must log in.
Revision history for this message
Stuart Colville (muffinresearch) wrote :

tests pass

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/UbuntuOne.wxs'
2--- install/UbuntuOne.wxs 2010-09-02 10:54:41 +0000
3+++ install/UbuntuOne.wxs 2010-09-02 10:54:41 +0000
4@@ -436,14 +436,6 @@
5 Source="build_results\u1sync\_ctypes.pyd"
6 KeyPath="yes"/>
7 </Component>
8- <Component Id="ElemtTreeComponent"
9- Guid="efe6b010-b1ee-11df-94e2-0800200c9a66">
10- <File Id="_elementtree.pyd"
11- Name="_elementtree.pyd"
12- DiskId="1"
13- Source="build_results\u1sync\_elementtree.pyd"
14- KeyPath="yes"/>
15- </Component>
16 <Component Id="HLibComponent"
17 Guid="15848270-b1ef-11df-94e2-0800200c9a66">
18 <File Id="_hashlib.pyd"
19@@ -620,62 +612,6 @@
20 Source="build_results\u1sync\bz2.pyd"
21 KeyPath="yes"/>
22 </Component>
23- <Component Id="BzrAnnotatorComponent"
24- Guid="252d08e0-b1f0-11df-94e2-0800200c9a66">
25- <File Id="bzrlib._annotator_pyx.pyd"
26- Name="bzrlib._annotator_pyx.pyd"
27- DiskId="1"
28- Source="build_results\u1sync\bzrlib._annotator_pyx.pyd"
29- KeyPath="yes"/>
30- </Component>
31- <Component Id="BzrBencodeComponent"
32- Guid="252d08e1-b1f0-11df-94e2-0800200c9a66">
33- <File Id="bzrlib._bencode_pyx.pyd"
34- Name="bzrlib._bencode_pyx.pyd"
35- DiskId="1"
36- Source="build_results\u1sync\bzrlib._bencode_pyx.pyd"
37- KeyPath="yes"/>
38- </Component>
39- <Component Id="BzrChkComponent"
40- Guid="252d08e2-b1f0-11df-94e2-0800200c9a66">
41- <File Id="bzrlib._chk_map_pyx.pyd"
42- Name="bzrlib._chk_map_pyx.pyd"
43- DiskId="1"
44- Source="build_results\u1sync\bzrlib._chk_map_pyx.pyd"
45- KeyPath="yes"/>
46- </Component>
47- <Component Id="BzrChunkComponent"
48- Guid="252d08e3-b1f0-11df-94e2-0800200c9a66">
49- <File Id="bzrlib._chunks_to_lines_pyx.pyd"
50- Name="bzrlib._chunks_to_lines_pyx.pyd"
51- DiskId="1"
52- Source="build_results\u1sync\bzrlib._chunks_to_lines_pyx.pyd"
53- KeyPath="yes"/>
54- </Component>
55- <Component Id="BzrPatienceDiffComponent"
56- Guid="252d08e5-b1f0-11df-94e2-0800200c9a66">
57- <File Id="bzrlib._patiencediff_c.pyd"
58- Name="bzrlib._patiencediff_c.pyd"
59- DiskId="1"
60- Source="build_results\u1sync\bzrlib._patiencediff_c.pyd"
61- KeyPath="yes"/>
62- </Component>
63- <Component Id="BzrRioComponent"
64- Guid="252d08e6-b1f0-11df-94e2-0800200c9a66">
65- <File Id="bzrlib._rio_pyx.pyd"
66- Name="bzrlib._rio_pyx.pyd"
67- DiskId="1"
68- Source="build_results\u1sync\bzrlib._rio_pyx.pyd"
69- KeyPath="yes"/>
70- </Component>
71- <Component Id="BzrStaticTupleComponent"
72- Guid="252d08e7-b1f0-11df-94e2-0800200c9a66">
73- <File Id="bzrlib._static_tuple_c.pyd"
74- Name="bzrlib._static_tuple_c.pyd"
75- DiskId="1"
76- Source="build_results\u1sync\bzrlib._static_tuple_c.pyd"
77- KeyPath="yes"/>
78- </Component>
79 <Component Id="KernelBaseComponent"
80 Guid="252d08e8-b1f0-11df-94e2-0800200c9a66">
81 <File Id="KERNELBASE.dll"
82@@ -836,14 +772,6 @@
83 Source="build_results\u1sync\win32api.pyd"
84 KeyPath="yes"/>
85 </Component>
86- <Component Id="Win32ComShellComponent"
87- Guid="bb15dbc9-b1f5-11df-94e2-0800200c9a66">
88- <File Id="win32com.shell.shell.pyd"
89- Name="win32com.shell.shell.pyd"
90- DiskId="1"
91- Source="build_results\u1sync\win32com.shell.shell.pyd"
92- KeyPath="yes"/>
93- </Component>
94 <Component Id="Win32EventComponent"
95 Guid="bb15dbca-b1f5-11df-94e2-0800200c9a66">
96 <File Id="win32event.pyd"
97@@ -908,14 +836,6 @@
98 Source="build_results\u1sync\win32wnet.pyd"
99 KeyPath="yes"/>
100 </Component>
101- <Component Id="ZLibComponent"
102- Guid="bb15dbd2-b1f5-11df-94e2-0800200c9a66">
103- <File Id="zlib1.dll"
104- Name="zlib1.dll"
105- DiskId="1"
106- Source="build_results\u1sync\zlib1.dll"
107- KeyPath="yes"/>
108- </Component>
109 <Component Id="ZopeInterfaceComponent"
110 Guid="bb15dbd3-b1f5-11df-94e2-0800200c9a66">
111 <File Id="zope.interface._zope_interface_coptimizations.pyd"
112@@ -1020,7 +940,6 @@
113 <ComponentRef Id="UbuntuOneClietnAutostart" />
114 <!-- U1Sync pacakge -->
115 <ComponentRef Id="CTypesComponent" />
116- <ComponentRef Id="ElemtTreeComponent" />
117 <ComponentRef Id="HLibComponent" />
118 <ComponentRef Id="SocketComponent" />
119 <ComponentRef Id="SSLComponent" />
120@@ -1043,13 +962,6 @@
121 <ComponentRef Id="WinCoreSysInfoComponent" />
122 <ComponentRef Id="WinCoreSecurityBaseComponent" />
123 <ComponentRef Id="Bz2Component" />
124- <ComponentRef Id="BzrAnnotatorComponent" />
125- <ComponentRef Id="BzrBencodeComponent" />
126- <ComponentRef Id="BzrChkComponent" />
127- <ComponentRef Id="BzrChunkComponent" />
128- <ComponentRef Id="BzrPatienceDiffComponent" />
129- <ComponentRef Id="BzrRioComponent" />
130- <ComponentRef Id="BzrStaticTupleComponent" />
131 <ComponentRef Id="KernelBaseComponent" />
132 <ComponentRef Id="Libeay32Component" />
133 <ComponentRef Id="LibraryComponent" />
134@@ -1070,7 +982,6 @@
135 <ComponentRef Id="UnicodeDataComponent" />
136 <ComponentRef Id="W9xpopenComponent" />
137 <ComponentRef Id="Win32ApiComponent" />
138- <ComponentRef Id="Win32ComShellComponent" />
139 <ComponentRef Id="Win32EventComponent" />
140 <ComponentRef Id="Win32EventLogComponent" />
141 <ComponentRef Id="Win32FileComponent" />
142@@ -1079,7 +990,6 @@
143 <ComponentRef Id="Win32SecurityComponent" />
144 <ComponentRef Id="Win32UIComponent" />
145 <ComponentRef Id="Win32WnetComponent" />
146- <ComponentRef Id="ZLibComponent" />
147 <ComponentRef Id="ZopeInterfaceComponent" />
148 <ComponentRef Id="MicrosoftVC90CRTManifestComponent" />
149 <ComponentRef Id="Msvcm90Component" />
150
151=== modified file 'lib/DotUpdater/DotUpdater.dll'
152Binary files lib/DotUpdater/DotUpdater.dll 2010-07-14 13:50:36 +0000 and lib/DotUpdater/DotUpdater.dll 2010-09-02 10:54:41 +0000 differ
153=== modified file 'lib/DotUpdater/DotUpdater.pdb'
154Binary files lib/DotUpdater/DotUpdater.pdb 2010-08-19 16:56:23 +0000 and lib/DotUpdater/DotUpdater.pdb 2010-09-02 10:54:41 +0000 differ
155=== modified file 'main.build'
156--- main.build 2010-09-02 10:54:41 +0000
157+++ main.build 2010-09-02 10:54:41 +0000
158@@ -15,7 +15,7 @@
159 <!-- property that allows to point to the location in which python was installer -->
160 <property name="python_path" value="C:\Python26" />
161 <!-- property that allows to pass the location to be used to update the package. -->
162- <property name="upload_path" value="http://s3.amazonaws.com/u1wintest/UbuntuOne.msi" />
163+ <property name="upload_path" value="http://s3.amazonaws.com/u1wintest/" />
164
165 <target name="clean"
166 description="Removes all the different results of the last comilation if they exist">
167@@ -300,7 +300,7 @@
168 managed="false"
169 workingdir="utils"
170 program="python.exe"
171- commandline='upload_new_update.py UbuntuOne.msi ${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision} "${upload_path}"' />
172+ commandline='upload_new_update.py UbuntuOne.msi ${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision} "${upload_path}${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}/UbuntuOne.msi"' />
173
174 <!-- delete the copied file -->
175 <delete file="utils/UbuntuOne.msi" />
176
177=== modified file 'utils/upload_new_update.py'
178--- utils/upload_new_update.py 2010-08-23 12:40:48 +0000
179+++ utils/upload_new_update.py 2010-09-02 10:54:41 +0000
180@@ -3,7 +3,6 @@
181
182 """This utilities release an Ubuntu One windows update."""
183
184-import base64
185 import hashlib
186 import os
187 import sys
188@@ -39,9 +38,9 @@
189 """Upload the RSS"""
190 now = time.strftime('%d %b %Y %H:%M:%S %Z')
191 rss_params['lastBuildDate'] = rss_params['pubDate'] = now
192- fd = open(filename,'r')
193- md5_hash = hashlib.md5(fd.read()).digest()
194- rss_params['md5'] = base64.urlsafe_b64encode(md5_hash)
195+ fd = open(filename,'rb')
196+ md5_hash = hashlib.md5(fd.read()).hexdigest()
197+ rss_params['md5'] = md5_hash
198 rss_params['lenght'] = os.path.getsize(filename)
199 rss_params['url'] = rss_params['url']
200 try:

Subscribers

People subscribed via source and target branches

to all changes: