From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C88961381F3 for ; Thu, 15 Aug 2013 09:19:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACD1FE0B39; Thu, 15 Aug 2013 09:19:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D04CE0B39 for ; Thu, 15 Aug 2013 09:19:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B2ED33EBC5 for ; Thu, 15 Aug 2013 09:18:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A0BE3E468F for ; Thu, 15 Aug 2013 09:18:57 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1376558161.bd68f9287ede316dfdb9a76d23a72249df8ed3cc.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/db/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/db/rrdtool.py X-VCS-Directories: roverlay/db/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: bd68f9287ede316dfdb9a76d23a72249df8ed3cc X-VCS-Branch: master Date: Thu, 15 Aug 2013 09:18:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 36213ab0-ce1c-485e-8b08-7f6d7486f3e1 X-Archives-Hash: b94dd2f357566fe87b91acdce25a4c85 commit: bd68f9287ede316dfdb9a76d23a72249df8ed3cc Author: André Erdmann mailerd de> AuthorDate: Thu Aug 15 09:16:01 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Aug 15 09:16:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=bd68f928 roverlay/db/rrdtool: more accurate xml parsing --- roverlay/db/rrdtool.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roverlay/db/rrdtool.py b/roverlay/db/rrdtool.py index 98c3bf5..d3c9d6d 100644 --- a/roverlay/db/rrdtool.py +++ b/roverlay/db/rrdtool.py @@ -304,10 +304,10 @@ class RRD ( object ): self.cache ['values'] = dict() for ds_node in eroot.findall ( "./ds" ): - ds_name = ds_node.find ( "name" ).text.strip() - ds_type = ds_node.find ( "type" ).text.strip() + ds_name = ds_node.find ( "./name" ).text.strip() + ds_type = ds_node.find ( "./type" ).text.strip() if ds_type != 'COMPUTE': - ds_value = ds_node.find ( "last_ds" ).text.strip() + ds_value = ds_node.find ( "./last_ds" ).text.strip() self.cache ['values'] [ds_name] = convert_value ( ds_value, ds_type )