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 (community) 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
=== modified file 'src/com/canonical/ubuntu/installer/UbuntuInstallService.java'
--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java 2014-01-03 06:42:51 +0000
+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java 2014-01-06 09:50:04 +0000
@@ -577,14 +577,10 @@
577 // extract utils into working folder.577 // extract utils into working folder.
578 Utils.extractExecutableAsset(this, ANDROID_BOOTMGR, workingFolderPath, true);578 Utils.extractExecutableAsset(this, ANDROID_BOOTMGR, workingFolderPath, true);
579 Utils.extractExecutableAsset(this, ANDROID_LOOP_MOUNT, workingFolderPath, true);579 Utils.extractExecutableAsset(this, ANDROID_LOOP_MOUNT, workingFolderPath, true);
580 Utils.extractExecutableAsset(this, ARCHIVE_MASTER_ASC, workingFolderPath, false);
581 Utils.extractExecutableAsset(this, ARCHIVE_MASTER, workingFolderPath, false);
582 Utils.extractExecutableAsset(this, BUSYBOX, workingFolderPath, true);580 Utils.extractExecutableAsset(this, BUSYBOX, workingFolderPath, true);
583 Utils.extractExecutableAsset(this, GPG, workingFolderPath, true);581 Utils.extractExecutableAsset(this, GPG, workingFolderPath, true);
584 Utils.extractExecutableAsset(this, TAR, workingFolderPath, true);582 Utils.extractExecutableAsset(this, TAR, workingFolderPath, true);
585 Utils.extractExecutableAsset(this, UPDATE_SCRIPT, workingFolderPath, true);583 Utils.extractExecutableAsset(this, UPDATE_SCRIPT, workingFolderPath, true);
586 Utils.extractExecutableAsset(this, U_REBOOT_APP_ASC, workingFolderPath, false);
587 Utils.extractExecutableAsset(this, U_REBOOT_APP, workingFolderPath, false);
588 Utils.extractExecutableAsset(this, UPGRADECHECKER, workingFolderPath, true);584 Utils.extractExecutableAsset(this, UPGRADECHECKER, workingFolderPath, true);
589 } catch (IOException e) {585 } catch (IOException e) {
590 throw(new EShellExecException("Failed to extract supporting utils"));586 throw(new EShellExecException("Failed to extract supporting utils"));
@@ -684,7 +680,7 @@
684 VersionInfo prevDownload = getDownloadVersion(this.getApplicationContext());680 VersionInfo prevDownload = getDownloadVersion(this.getApplicationContext());
685 try {681 try {
686 File rootFolder = new File(mRootOfWorkPath);682 File rootFolder = new File(mRootOfWorkPath);
687 683
688 // first get from JSON list of files to download684 // first get from JSON list of files to download
689 String alias = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_ALIAS);685 String alias = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_ALIAS);
690 String jsonUrl = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL);686 String jsonUrl = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL);
@@ -835,6 +831,13 @@
835 updateFilenames[i] = doDownloadFileSignature(file, release);831 updateFilenames[i] = doDownloadFileSignature(file, release);
836 i++;832 i++;
837 }833 }
834
835 // data required for installation.
836 Utils.extractExecutableAsset(this, ARCHIVE_MASTER_ASC, release.getAbsolutePath(), false);
837 Utils.extractExecutableAsset(this, ARCHIVE_MASTER, release.getAbsolutePath(), false);
838 // Ubuntu reboot apps.
839 Utils.extractExecutableAsset(this, U_REBOOT_APP_ASC, release.getAbsolutePath(), false);
840 Utils.extractExecutableAsset(this, U_REBOOT_APP, release.getAbsolutePath(), false);
838 } catch (MalformedURLException e) {841 } catch (MalformedURLException e) {
839 Log.e(TAG, "Failed to download release:", e);842 Log.e(TAG, "Failed to download release:", e);
840 return handleDownloadError(result, -1, "Malformed release url");843 return handleDownloadError(result, -1, "Malformed release url");

Subscribers

People subscribed via source and target branches

to all changes: