diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-20 22:53:09 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-20 22:53:09 +0000 |
| commit | 98d0dd758970c311cd7f4f05dd7760686754e916 (patch) | |
| tree | 4d70adc1f3563d7b7ef19f1ec851e11c79fab415 /chrome/installer/util | |
| parent | a9c6299d644877904be7937ec1751da3e6752f97 (diff) | |
| download | chromium_src-98d0dd758970c311cd7f4f05dd7760686754e916.zip chromium_src-98d0dd758970c311cd7f4f05dd7760686754e916.tar.gz chromium_src-98d0dd758970c311cd7f4f05dd7760686754e916.tar.bz2 | |
Reduce console spam from master_preferences.
It's ok (and common) for master preferences to not exist.
TEST=compiles
Review URL: http://codereview.chromium.org/3413022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
| -rw-r--r-- | chrome/installer/util/master_preferences.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index e2c0c80..2e037d0 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -165,11 +165,9 @@ DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line) { DictionaryValue* ParseDistributionPreferences( const FilePath& master_prefs_path) { - if (!file_util::PathExists(master_prefs_path)) { - LOG(WARNING) << "Master preferences file not found: " - << master_prefs_path.value(); + if (!file_util::PathExists(master_prefs_path)) return NULL; - } + std::string json_data; if (!file_util::ReadFileToString(master_prefs_path, &json_data)) { LOG(WARNING) << "Failed to read master prefs file."; |