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
=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs 2010-09-02 10:54:41 +0000
+++ install/UbuntuOne.wxs 2010-09-02 10:54:41 +0000
@@ -436,14 +436,6 @@
436 Source="build_results\u1sync\_ctypes.pyd" 436 Source="build_results\u1sync\_ctypes.pyd"
437 KeyPath="yes"/>437 KeyPath="yes"/>
438 </Component>438 </Component>
439 <Component Id="ElemtTreeComponent"
440 Guid="efe6b010-b1ee-11df-94e2-0800200c9a66">
441 <File Id="_elementtree.pyd"
442 Name="_elementtree.pyd"
443 DiskId="1"
444 Source="build_results\u1sync\_elementtree.pyd"
445 KeyPath="yes"/>
446 </Component>
447 <Component Id="HLibComponent" 439 <Component Id="HLibComponent"
448 Guid="15848270-b1ef-11df-94e2-0800200c9a66">440 Guid="15848270-b1ef-11df-94e2-0800200c9a66">
449 <File Id="_hashlib.pyd" 441 <File Id="_hashlib.pyd"
@@ -620,62 +612,6 @@
620 Source="build_results\u1sync\bz2.pyd" 612 Source="build_results\u1sync\bz2.pyd"
621 KeyPath="yes"/>613 KeyPath="yes"/>
622 </Component>614 </Component>
623 <Component Id="BzrAnnotatorComponent"
624 Guid="252d08e0-b1f0-11df-94e2-0800200c9a66">
625 <File Id="bzrlib._annotator_pyx.pyd"
626 Name="bzrlib._annotator_pyx.pyd"
627 DiskId="1"
628 Source="build_results\u1sync\bzrlib._annotator_pyx.pyd"
629 KeyPath="yes"/>
630 </Component>
631 <Component Id="BzrBencodeComponent"
632 Guid="252d08e1-b1f0-11df-94e2-0800200c9a66">
633 <File Id="bzrlib._bencode_pyx.pyd"
634 Name="bzrlib._bencode_pyx.pyd"
635 DiskId="1"
636 Source="build_results\u1sync\bzrlib._bencode_pyx.pyd"
637 KeyPath="yes"/>
638 </Component>
639 <Component Id="BzrChkComponent"
640 Guid="252d08e2-b1f0-11df-94e2-0800200c9a66">
641 <File Id="bzrlib._chk_map_pyx.pyd"
642 Name="bzrlib._chk_map_pyx.pyd"
643 DiskId="1"
644 Source="build_results\u1sync\bzrlib._chk_map_pyx.pyd"
645 KeyPath="yes"/>
646 </Component>
647 <Component Id="BzrChunkComponent"
648 Guid="252d08e3-b1f0-11df-94e2-0800200c9a66">
649 <File Id="bzrlib._chunks_to_lines_pyx.pyd"
650 Name="bzrlib._chunks_to_lines_pyx.pyd"
651 DiskId="1"
652 Source="build_results\u1sync\bzrlib._chunks_to_lines_pyx.pyd"
653 KeyPath="yes"/>
654 </Component>
655 <Component Id="BzrPatienceDiffComponent"
656 Guid="252d08e5-b1f0-11df-94e2-0800200c9a66">
657 <File Id="bzrlib._patiencediff_c.pyd"
658 Name="bzrlib._patiencediff_c.pyd"
659 DiskId="1"
660 Source="build_results\u1sync\bzrlib._patiencediff_c.pyd"
661 KeyPath="yes"/>
662 </Component>
663 <Component Id="BzrRioComponent"
664 Guid="252d08e6-b1f0-11df-94e2-0800200c9a66">
665 <File Id="bzrlib._rio_pyx.pyd"
666 Name="bzrlib._rio_pyx.pyd"
667 DiskId="1"
668 Source="build_results\u1sync\bzrlib._rio_pyx.pyd"
669 KeyPath="yes"/>
670 </Component>
671 <Component Id="BzrStaticTupleComponent"
672 Guid="252d08e7-b1f0-11df-94e2-0800200c9a66">
673 <File Id="bzrlib._static_tuple_c.pyd"
674 Name="bzrlib._static_tuple_c.pyd"
675 DiskId="1"
676 Source="build_results\u1sync\bzrlib._static_tuple_c.pyd"
677 KeyPath="yes"/>
678 </Component>
679 <Component Id="KernelBaseComponent" 615 <Component Id="KernelBaseComponent"
680 Guid="252d08e8-b1f0-11df-94e2-0800200c9a66">616 Guid="252d08e8-b1f0-11df-94e2-0800200c9a66">
681 <File Id="KERNELBASE.dll" 617 <File Id="KERNELBASE.dll"
@@ -836,14 +772,6 @@
836 Source="build_results\u1sync\win32api.pyd" 772 Source="build_results\u1sync\win32api.pyd"
837 KeyPath="yes"/>773 KeyPath="yes"/>
838 </Component>774 </Component>
839 <Component Id="Win32ComShellComponent"
840 Guid="bb15dbc9-b1f5-11df-94e2-0800200c9a66">
841 <File Id="win32com.shell.shell.pyd"
842 Name="win32com.shell.shell.pyd"
843 DiskId="1"
844 Source="build_results\u1sync\win32com.shell.shell.pyd"
845 KeyPath="yes"/>
846 </Component>
847 <Component Id="Win32EventComponent" 775 <Component Id="Win32EventComponent"
848 Guid="bb15dbca-b1f5-11df-94e2-0800200c9a66">776 Guid="bb15dbca-b1f5-11df-94e2-0800200c9a66">
849 <File Id="win32event.pyd" 777 <File Id="win32event.pyd"
@@ -908,14 +836,6 @@
908 Source="build_results\u1sync\win32wnet.pyd" 836 Source="build_results\u1sync\win32wnet.pyd"
909 KeyPath="yes"/>837 KeyPath="yes"/>
910 </Component>838 </Component>
911 <Component Id="ZLibComponent"
912 Guid="bb15dbd2-b1f5-11df-94e2-0800200c9a66">
913 <File Id="zlib1.dll"
914 Name="zlib1.dll"
915 DiskId="1"
916 Source="build_results\u1sync\zlib1.dll"
917 KeyPath="yes"/>
918 </Component>
919 <Component Id="ZopeInterfaceComponent" 839 <Component Id="ZopeInterfaceComponent"
920 Guid="bb15dbd3-b1f5-11df-94e2-0800200c9a66">840 Guid="bb15dbd3-b1f5-11df-94e2-0800200c9a66">
921 <File Id="zope.interface._zope_interface_coptimizations.pyd" 841 <File Id="zope.interface._zope_interface_coptimizations.pyd"
@@ -1020,7 +940,6 @@
1020 <ComponentRef Id="UbuntuOneClietnAutostart" />940 <ComponentRef Id="UbuntuOneClietnAutostart" />
1021 <!-- U1Sync pacakge -->941 <!-- U1Sync pacakge -->
1022 <ComponentRef Id="CTypesComponent" />942 <ComponentRef Id="CTypesComponent" />
1023 <ComponentRef Id="ElemtTreeComponent" />
1024 <ComponentRef Id="HLibComponent" />943 <ComponentRef Id="HLibComponent" />
1025 <ComponentRef Id="SocketComponent" />944 <ComponentRef Id="SocketComponent" />
1026 <ComponentRef Id="SSLComponent" />945 <ComponentRef Id="SSLComponent" />
@@ -1043,13 +962,6 @@
1043 <ComponentRef Id="WinCoreSysInfoComponent" />962 <ComponentRef Id="WinCoreSysInfoComponent" />
1044 <ComponentRef Id="WinCoreSecurityBaseComponent" />963 <ComponentRef Id="WinCoreSecurityBaseComponent" />
1045 <ComponentRef Id="Bz2Component" />964 <ComponentRef Id="Bz2Component" />
1046 <ComponentRef Id="BzrAnnotatorComponent" />
1047 <ComponentRef Id="BzrBencodeComponent" />
1048 <ComponentRef Id="BzrChkComponent" />
1049 <ComponentRef Id="BzrChunkComponent" />
1050 <ComponentRef Id="BzrPatienceDiffComponent" />
1051 <ComponentRef Id="BzrRioComponent" />
1052 <ComponentRef Id="BzrStaticTupleComponent" />
1053 <ComponentRef Id="KernelBaseComponent" />965 <ComponentRef Id="KernelBaseComponent" />
1054 <ComponentRef Id="Libeay32Component" />966 <ComponentRef Id="Libeay32Component" />
1055 <ComponentRef Id="LibraryComponent" />967 <ComponentRef Id="LibraryComponent" />
@@ -1070,7 +982,6 @@
1070 <ComponentRef Id="UnicodeDataComponent" />982 <ComponentRef Id="UnicodeDataComponent" />
1071 <ComponentRef Id="W9xpopenComponent" />983 <ComponentRef Id="W9xpopenComponent" />
1072 <ComponentRef Id="Win32ApiComponent" />984 <ComponentRef Id="Win32ApiComponent" />
1073 <ComponentRef Id="Win32ComShellComponent" />
1074 <ComponentRef Id="Win32EventComponent" />985 <ComponentRef Id="Win32EventComponent" />
1075 <ComponentRef Id="Win32EventLogComponent" />986 <ComponentRef Id="Win32EventLogComponent" />
1076 <ComponentRef Id="Win32FileComponent" />987 <ComponentRef Id="Win32FileComponent" />
@@ -1079,7 +990,6 @@
1079 <ComponentRef Id="Win32SecurityComponent" />990 <ComponentRef Id="Win32SecurityComponent" />
1080 <ComponentRef Id="Win32UIComponent" />991 <ComponentRef Id="Win32UIComponent" />
1081 <ComponentRef Id="Win32WnetComponent" />992 <ComponentRef Id="Win32WnetComponent" />
1082 <ComponentRef Id="ZLibComponent" />
1083 <ComponentRef Id="ZopeInterfaceComponent" />993 <ComponentRef Id="ZopeInterfaceComponent" />
1084 <ComponentRef Id="MicrosoftVC90CRTManifestComponent" />994 <ComponentRef Id="MicrosoftVC90CRTManifestComponent" />
1085 <ComponentRef Id="Msvcm90Component" />995 <ComponentRef Id="Msvcm90Component" />
1086996
=== modified file 'lib/DotUpdater/DotUpdater.dll'
1087Binary files lib/DotUpdater/DotUpdater.dll 2010-07-14 13:50:36 +0000 and lib/DotUpdater/DotUpdater.dll 2010-09-02 10:54:41 +0000 differ997Binary 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
=== modified file 'lib/DotUpdater/DotUpdater.pdb'
1088Binary files lib/DotUpdater/DotUpdater.pdb 2010-08-19 16:56:23 +0000 and lib/DotUpdater/DotUpdater.pdb 2010-09-02 10:54:41 +0000 differ998Binary 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
=== modified file 'main.build'
--- main.build 2010-09-02 10:54:41 +0000
+++ main.build 2010-09-02 10:54:41 +0000
@@ -15,7 +15,7 @@
15 <!-- property that allows to point to the location in which python was installer -->15 <!-- property that allows to point to the location in which python was installer -->
16 <property name="python_path" value="C:\Python26" />16 <property name="python_path" value="C:\Python26" />
17 <!-- property that allows to pass the location to be used to update the package. -->17 <!-- property that allows to pass the location to be used to update the package. -->
18 <property name="upload_path" value="http://s3.amazonaws.com/u1wintest/UbuntuOne.msi" />18 <property name="upload_path" value="http://s3.amazonaws.com/u1wintest/" />
19 19
20 <target name="clean" 20 <target name="clean"
21 description="Removes all the different results of the last comilation if they exist">21 description="Removes all the different results of the last comilation if they exist">
@@ -300,7 +300,7 @@
300 managed="false"300 managed="false"
301 workingdir="utils"301 workingdir="utils"
302 program="python.exe"302 program="python.exe"
303 commandline='upload_new_update.py UbuntuOne.msi ${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision} "${upload_path}"' />303 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"' />
304 304
305 <!-- delete the copied file -->305 <!-- delete the copied file -->
306 <delete file="utils/UbuntuOne.msi" />306 <delete file="utils/UbuntuOne.msi" />
307307
=== modified file 'utils/upload_new_update.py'
--- utils/upload_new_update.py 2010-08-23 12:40:48 +0000
+++ utils/upload_new_update.py 2010-09-02 10:54:41 +0000
@@ -3,7 +3,6 @@
33
4"""This utilities release an Ubuntu One windows update."""4"""This utilities release an Ubuntu One windows update."""
55
6import base64
7import hashlib6import hashlib
8import os7import os
9import sys8import sys
@@ -39,9 +38,9 @@
39 """Upload the RSS"""38 """Upload the RSS"""
40 now = time.strftime('%d %b %Y %H:%M:%S %Z')39 now = time.strftime('%d %b %Y %H:%M:%S %Z')
41 rss_params['lastBuildDate'] = rss_params['pubDate'] = now40 rss_params['lastBuildDate'] = rss_params['pubDate'] = now
42 fd = open(filename,'r')41 fd = open(filename,'rb')
43 md5_hash = hashlib.md5(fd.read()).digest()42 md5_hash = hashlib.md5(fd.read()).hexdigest()
44 rss_params['md5'] = base64.urlsafe_b64encode(md5_hash)43 rss_params['md5'] = md5_hash
45 rss_params['lenght'] = os.path.getsize(filename)44 rss_params['lenght'] = os.path.getsize(filename)
46 rss_params['url'] = rss_params['url']45 rss_params['url'] = rss_params['url']
47 try:46 try:

Subscribers

People subscribed via source and target branches

to all changes: