Merge lp:~humpolec-team/humpolec/UbuntuInstaller-lp1266377 into lp:humpolec

Proposed by Rex Tsai
Status: Merged
Merge reported by: Rex Tsai
Merged at revision: not available
Proposed branch: lp:~humpolec-team/humpolec/UbuntuInstaller-lp1266377
Merge into: lp:humpolec
Diff against target: 41 lines (+8/-5)
1 file modified
src/com/canonical/ubuntu/installer/UbuntuInstallService.java (+8/-5)
To merge this branch: bzr merge lp:~humpolec-team/humpolec/UbuntuInstaller-lp1266377
Reviewer Review Type Date Requested Status
Yuan-Chen Cheng Approve
Review via email: mp+200507@code.launchpad.net

Description of the change

We should extract app and keyring file in the download folder. The code is verified on Nexus10.

TODO:
* Need to check why the keyring does not exist, but installer script still works.

To post a comment you must log in.
Revision history for this message
Yuan-Chen Cheng (ycheng-twn) wrote :

Yes, reasonable to put the code immediately after download code, since
downloaded file need then to works together.

Look good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/canonical/ubuntu/installer/UbuntuInstallService.java'
2--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java 2014-01-03 06:42:51 +0000
3+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java 2014-01-06 09:50:04 +0000
4@@ -577,14 +577,10 @@
5 // extract utils into working folder.
6 Utils.extractExecutableAsset(this, ANDROID_BOOTMGR, workingFolderPath, true);
7 Utils.extractExecutableAsset(this, ANDROID_LOOP_MOUNT, workingFolderPath, true);
8- Utils.extractExecutableAsset(this, ARCHIVE_MASTER_ASC, workingFolderPath, false);
9- Utils.extractExecutableAsset(this, ARCHIVE_MASTER, workingFolderPath, false);
10 Utils.extractExecutableAsset(this, BUSYBOX, workingFolderPath, true);
11 Utils.extractExecutableAsset(this, GPG, workingFolderPath, true);
12 Utils.extractExecutableAsset(this, TAR, workingFolderPath, true);
13 Utils.extractExecutableAsset(this, UPDATE_SCRIPT, workingFolderPath, true);
14- Utils.extractExecutableAsset(this, U_REBOOT_APP_ASC, workingFolderPath, false);
15- Utils.extractExecutableAsset(this, U_REBOOT_APP, workingFolderPath, false);
16 Utils.extractExecutableAsset(this, UPGRADECHECKER, workingFolderPath, true);
17 } catch (IOException e) {
18 throw(new EShellExecException("Failed to extract supporting utils"));
19@@ -684,7 +680,7 @@
20 VersionInfo prevDownload = getDownloadVersion(this.getApplicationContext());
21 try {
22 File rootFolder = new File(mRootOfWorkPath);
23-
24+
25 // first get from JSON list of files to download
26 String alias = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_ALIAS);
27 String jsonUrl = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL);
28@@ -835,6 +831,13 @@
29 updateFilenames[i] = doDownloadFileSignature(file, release);
30 i++;
31 }
32+
33+ // data required for installation.
34+ Utils.extractExecutableAsset(this, ARCHIVE_MASTER_ASC, release.getAbsolutePath(), false);
35+ Utils.extractExecutableAsset(this, ARCHIVE_MASTER, release.getAbsolutePath(), false);
36+ // Ubuntu reboot apps.
37+ Utils.extractExecutableAsset(this, U_REBOOT_APP_ASC, release.getAbsolutePath(), false);
38+ Utils.extractExecutableAsset(this, U_REBOOT_APP, release.getAbsolutePath(), false);
39 } catch (MalformedURLException e) {
40 Log.e(TAG, "Failed to download release:", e);
41 return handleDownloadError(result, -1, "Malformed release url");

Subscribers

People subscribed via source and target branches

to all changes: