Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Side by Side Diff: src/platform/update_engine/omaha_response_handler_action.cc

Issue 2044001: AU: Minor fixes to get it to do full update on real device (Closed) Base URL: ssh://git@chromiumos-git/chromeos
Patch Set: fixes for review Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "update_engine/omaha_response_handler_action.h" 5 #include "update_engine/omaha_response_handler_action.h"
6 #include <string> 6 #include <string>
7 #include "update_engine/utils.h" 7 #include "update_engine/utils.h"
8 8
9 using std::string; 9 using std::string;
10 10
(...skipping 14 matching lines...) Expand all
25 got_no_update_response_ = true; 25 got_no_update_response_ = true;
26 LOG(INFO) << "There are no updates. Aborting."; 26 LOG(INFO) << "There are no updates. Aborting.";
27 return; 27 return;
28 } 28 }
29 InstallPlan install_plan; 29 InstallPlan install_plan;
30 install_plan.download_url = response.codebase; 30 install_plan.download_url = response.codebase;
31 install_plan.download_hash = response.hash; 31 install_plan.download_hash = response.hash;
32 TEST_AND_RETURN(GetInstallDev( 32 TEST_AND_RETURN(GetInstallDev(
33 (!boot_device_.empty() ? boot_device_ : utils::BootDevice()), 33 (!boot_device_.empty() ? boot_device_ : utils::BootDevice()),
34 &install_plan.install_path)); 34 &install_plan.install_path));
35 install_plan.kernel_install_path =
36 utils::BootKernelDevice(install_plan.install_path);
35 37
36 // Get the filename part of the url. Assume that if it has kFullUpdateTag 38 // Get the filename part of the url. Assume that if it has kFullUpdateTag
37 // in the name, it's a full update. 39 // in the name, it's a full update.
38 string::size_type last_slash = response.codebase.rfind('/'); 40 string::size_type last_slash = response.codebase.rfind('/');
39 string filename; 41 string filename;
40 if (last_slash == string::npos) 42 if (last_slash == string::npos)
41 filename = response.codebase; 43 filename = response.codebase;
42 else 44 else
43 filename = response.codebase.substr(last_slash + 1); 45 filename = response.codebase.substr(last_slash + 1);
44 install_plan.is_full_update = (filename.find(kFullUpdateTag) != string::npos); 46 install_plan.is_full_update = (filename.find(kFullUpdateTag) != string::npos);
45 47
46 if (filename.size() > 255) { 48 if (filename.size() > 255) {
47 // Very long name. Let's shorten it 49 // Very long name. Let's shorten it
48 filename.resize(255); 50 filename.resize(255);
49 } 51 }
52 TEST_AND_RETURN(HasOutputPipe());
50 if (HasOutputPipe()) 53 if (HasOutputPipe())
51 SetOutputObject(install_plan); 54 SetOutputObject(install_plan);
52 LOG(INFO) << "Using this install plan:"; 55 LOG(INFO) << "Using this install plan:";
53 install_plan.Dump(); 56 install_plan.Dump();
57
54 completer.set_success(true); 58 completer.set_success(true);
55 } 59 }
56 60
57 bool OmahaResponseHandlerAction::GetInstallDev(const std::string& boot_dev, 61 bool OmahaResponseHandlerAction::GetInstallDev(const std::string& boot_dev,
58 std::string* install_dev) { 62 std::string* install_dev) {
59 TEST_AND_RETURN_FALSE(!boot_dev.empty()); 63 TEST_AND_RETURN_FALSE(utils::StringHasPrefix(boot_dev, "/dev/"));
60 string ret(boot_dev); 64 string ret(boot_dev);
61 char last_char = *ret.rbegin(); 65 string::reverse_iterator it = ret.rbegin(); // last character in string
62 TEST_AND_RETURN_FALSE((last_char >= '0') && (last_char <= '9')); 66 // Right now, we just switch '3' and '5' partition numbers.
63 // Chop off last char 67 TEST_AND_RETURN_FALSE((*it == '3') || (*it == '5'));
64 ret.resize(ret.size() - 1); 68 *it = (*it == '3') ? '5' : '3';
65 // If last_char is odd (1 or 3), increase it, otherwise decrease
66 if (last_char % 2)
67 last_char++;
68 else
69 last_char--;
70 ret += last_char;
71 *install_dev = ret; 69 *install_dev = ret;
72 return true; 70 return true;
73 } 71 }
74 72
75 } // namespace chromeos_update_engine 73 } // namespace chromeos_update_engine
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698