diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-03-09 20:23:35 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-03-09 20:23:35 +0000 |
| commit | 5e494a8be31724d0b2f990f60337c83e545d4c1e (patch) | |
| tree | 89aa1e4b25395b776a41a77d2c33f91fc5e925cc /src/sbin | |
| parent | 40c0c342fcdd1cea0b9b8972ea539d7368b85f82 (diff) | |
| download | bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.tar.gz bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.tar.bz2 bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.zip | |
* Remove messages describing extra configuration elements when running in bundle mode
* Handle garbage filenames in Cfg more gracefully
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1799 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 3c97e8bab..5b9270595 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -349,7 +349,7 @@ class Client: if self.setup['bundle']: replacement_xml = Element("Configuration", version='2.0') - for child in self.config.getroot().getchildren(): + for child in self.config.getchildren(): if ((child.tag == 'Bundle') and (child.attrib['name'] == self.setup['bundle'])): replacement_xml.append(child) @@ -376,7 +376,7 @@ class Client: times['install'] = time.time() times['finished'] = time.time() - if not self.setup['file']: + if not self.setup['file'] and not self.setup['bundle']: # upload statistics feedback = Element("upload-statistics") timeinfo = Element("OpStamps") |