From 1f277353bdba2a4a83cc8b95cb69e2d5cab0eb25 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Sun, 13 Oct 2013 02:07:38 -0700 Subject: [PATCH] catalyst: Remove commented sections of code Code in the upstream tree should either run or it shouldn't be there. Reviewed-by: Matt Turner --- catalyst | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/catalyst b/catalyst index 36bd7097..68fa1092 100755 --- a/catalyst +++ b/catalyst @@ -128,10 +128,6 @@ def parse_config(myconfig): print "Cleaning autoresume flags support enabled." conf_values["CLEAR_AUTORESUME"]="1" -# if "compress" in string.split(conf_values["options"]): -# print "Compression enabled." -# conf_values["COMPRESS"]="1" - if "distcc" in string.split(conf_values["options"]): print "Distcc support enabled." conf_values["DISTCC"]="1" @@ -164,10 +160,6 @@ def parse_config(myconfig): print "Snapshot cache support enabled." conf_values["SNAPCACHE"]="1" -# if "tarball" in string.split(conf_values["options"]): -# print "Tarball creation enabled." -# conf_values["TARBALL"]="1" - if "digests" in myconf: conf_values["digests"]=myconf["digests"] if "contents" in myconf: @@ -414,20 +406,3 @@ if __name__ == "__main__": print "Catalyst aborting...." raise sys.exit(2) - - #except CatalystError: - # print - # print "Catalyst aborting...." - # sys.exit(2) - #except KeyError: - # print "\nproblem with command line or spec file ( Key Error )" - # print "Key: "+str(sys.exc_value)+" was not found" - # print "Catalyst aborting...." - # sys.exit(2) - #except UnboundLocalError: - # print - # print "UnboundLocalError: "+str(sys.exc_value)+" was not found" - # raise - # print - # print "Catalyst aborting...." - # sys.exit(2) -- 2.26.2