From f807391125a1dc4f852afc7d9642e47334f8d9b2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 20 Mar 2013 14:11:18 -0400 Subject: migrate_perms_to_mode.py: migrate SSHbase/info.xml --- tools/upgrade/1.3/migrate_perms_to_mode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/upgrade/1.3/migrate_perms_to_mode.py') diff --git a/tools/upgrade/1.3/migrate_perms_to_mode.py b/tools/upgrade/1.3/migrate_perms_to_mode.py index a15de6e29..de336456f 100755 --- a/tools/upgrade/1.3/migrate_perms_to_mode.py +++ b/tools/upgrade/1.3/migrate_perms_to_mode.py @@ -55,7 +55,7 @@ def main(): for root, dirs, files in os.walk(os.path.join(repo, plugin)): for fname in files: convertstructure(os.path.join(root, fname)) - if plugin not in ['Cfg', 'TGenshi', 'TCheetah']: + if plugin not in ['Cfg', 'TGenshi', 'TCheetah', 'SSHbase']: continue for root, dirs, files in os.walk(os.path.join(repo, plugin)): for fname in files: -- cgit v1.2.3-1-g7c22 From c25b2ba21fbf5a349a49173bdfd82e208b9f74bd Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 20 Mar 2013 15:08:00 -0400 Subject: migrate_perms_to_mode.py: really seriously handle nested Path tags --- tools/upgrade/1.3/migrate_perms_to_mode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/upgrade/1.3/migrate_perms_to_mode.py') diff --git a/tools/upgrade/1.3/migrate_perms_to_mode.py b/tools/upgrade/1.3/migrate_perms_to_mode.py index de336456f..ff3fe91c0 100755 --- a/tools/upgrade/1.3/migrate_perms_to_mode.py +++ b/tools/upgrade/1.3/migrate_perms_to_mode.py @@ -36,7 +36,7 @@ def convertstructure(structfile): """Do perms -> mode conversion for structure files.""" xdata = lxml.etree.parse(structfile) found = False - for path in xdata.xpath('//BoundPath|Path'): + for path in xdata.xpath('//BoundPath|//Path'): found = setmodeattr(path) if found: writefile(structfile, xdata) -- cgit v1.2.3-1-g7c22 From 40d3802f31ffbc1f48689a7bbb3087bda1c52f35 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 20 Mar 2013 15:09:09 -0400 Subject: migrate_perms_to_mode.py: gracefully handle unparseable XML files --- tools/upgrade/1.3/migrate_perms_to_mode.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'tools/upgrade/1.3/migrate_perms_to_mode.py') diff --git a/tools/upgrade/1.3/migrate_perms_to_mode.py b/tools/upgrade/1.3/migrate_perms_to_mode.py index ff3fe91c0..a5e045750 100755 --- a/tools/upgrade/1.3/migrate_perms_to_mode.py +++ b/tools/upgrade/1.3/migrate_perms_to_mode.py @@ -24,7 +24,12 @@ def writefile(f, xdata): def convertinfo(ifile): """Do perms -> mode conversion for info.xml files.""" - xdata = lxml.etree.parse(ifile) + try: + xdata = lxml.etree.parse(ifile) + except lxml.etree.XMLSyntaxError: + err = sys.exc_info()[1] + print("Could not parse %s, skipping: %s" % (ifile, err)) + return found = False for i in xdata.findall('//Info'): found = setmodeattr(i) @@ -34,7 +39,12 @@ def convertinfo(ifile): def convertstructure(structfile): """Do perms -> mode conversion for structure files.""" - xdata = lxml.etree.parse(structfile) + try: + xdata = lxml.etree.parse(structfile) + except lxml.etree.XMLSyntaxError: + err = sys.exc_info()[1] + print("Could not parse %s, skipping: %s" % (structfile, err)) + return found = False for path in xdata.xpath('//BoundPath|//Path'): found = setmodeattr(path) -- cgit v1.2.3-1-g7c22 From 0d04e326aa86ebb614dde1ab625dadbbefa784e8 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 21 Mar 2013 08:26:13 -0400 Subject: migrate_perms_to_mode.py: handle info.xml files for SSLCA --- tools/upgrade/1.3/migrate_perms_to_mode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/upgrade/1.3/migrate_perms_to_mode.py') diff --git a/tools/upgrade/1.3/migrate_perms_to_mode.py b/tools/upgrade/1.3/migrate_perms_to_mode.py index a5e045750..e061558d3 100755 --- a/tools/upgrade/1.3/migrate_perms_to_mode.py +++ b/tools/upgrade/1.3/migrate_perms_to_mode.py @@ -65,7 +65,7 @@ def main(): for root, dirs, files in os.walk(os.path.join(repo, plugin)): for fname in files: convertstructure(os.path.join(root, fname)) - if plugin not in ['Cfg', 'TGenshi', 'TCheetah', 'SSHbase']: + if plugin not in ['Cfg', 'TGenshi', 'TCheetah', 'SSHbase', 'SSLCA']: continue for root, dirs, files in os.walk(os.path.join(repo, plugin)): for fname in files: -- cgit v1.2.3-1-g7c22