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

Unified Diff: filesystem_copier_action.cc

Issue 3620013: AU: Resume interrupted update attempts. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/update_engine.git
Patch Set: fix setup download Created 10 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « download_action.h ('k') | filesystem_copier_action_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: filesystem_copier_action.cc
diff --git a/filesystem_copier_action.cc b/filesystem_copier_action.cc
index 388e0e7a88b57fce7cfbc7582b2fde39d125bba6..5628ec3517055ae1058b083ba714795440187840 100755
--- a/filesystem_copier_action.cc
+++ b/filesystem_copier_action.cc
@@ -1,21 +1,25 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "update_engine/filesystem_copier_action.h"
+
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
-#include <stdlib.h>
+
#include <algorithm>
+#include <cstdlib>
#include <map>
#include <string>
#include <vector>
+
#include <gio/gio.h>
#include <gio/gunixinputstream.h>
#include <gio/gunixoutputstream.h>
#include <glib.h>
+
#include "update_engine/filesystem_iterator.h"
#include "update_engine/subprocess.h"
#include "update_engine/utils.h"
@@ -41,7 +45,7 @@ void FilesystemCopierAction::PerformAction() {
}
install_plan_ = GetInputObject();
- if (install_plan_.is_full_update) {
+ if (install_plan_.is_full_update || install_plan_.is_resume) {
// No copy needed. Done!
if (HasOutputPipe())
SetOutputObject(install_plan_);
« no previous file with comments | « download_action.h ('k') | filesystem_copier_action_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698