From ee57633ec5db97ac0c27839b799fbdf7d6df3691 Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Sat, 24 Jul 2021 13:16:19 -0400 Subject: [PATCH] Fix indentation in viewer_manifest --- indra/newview/viewer_manifest.py | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9fdaad43d23..4cbe947d86d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -149,30 +149,30 @@ def construct(self): # skins with self.prefix(src_dst="skins"): - # include the entire textures directory recursively - with self.prefix(src_dst="*/textures"): - self.path("*/*.jpg") - self.path("*/*.png") - self.path("*.tga") - self.path("*.j2c") - self.path("*.png") - self.path("textures.xml") - self.path("*/xui/*/*.xml") - self.path("*/xui/*/widgets/*.xml") - self.path("*/*.xml") - self.path("*/*.json") - - # Local HTML files (e.g. loading screen) - # The claim is that we never use local html files any - # longer. But rather than commenting out this block, let's - # rename every html subdirectory as html.old. That way, if - # we're wrong, a user actually does have the relevant - # files; s/he just needs to rename every html.old - # directory back to html to recover them. - with self.prefix(src="*/html", dst="*/html.old"): - self.path("*.png") - self.path("*/*/*.html") - self.path("*/*/*.gif") + # include the entire textures directory recursively + with self.prefix(src_dst="*/textures"): + self.path("*/*.jpg") + self.path("*/*.png") + self.path("*.tga") + self.path("*.j2c") + self.path("*.png") + self.path("textures.xml") + self.path("*/xui/*/*.xml") + self.path("*/xui/*/widgets/*.xml") + self.path("*/*.xml") + self.path("*/*.json") + + # Local HTML files (e.g. loading screen) + # The claim is that we never use local html files any + # longer. But rather than commenting out this block, let's + # rename every html subdirectory as html.old. That way, if + # we're wrong, a user actually does have the relevant + # files; s/he just needs to rename every html.old + # directory back to html to recover them. + with self.prefix(src="*/html", dst="*/html.old"): + self.path("*.png") + self.path("*/*/*.html") + self.path("*/*/*.gif") #build_data.json. Standard with exception handling is fine. If we can't open a new file for writing, we have worse problems -- GitLab