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 D1CBF1381F3 for ; Sun, 13 Oct 2013 09:07:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 407A7E099F; Sun, 13 Oct 2013 09:07:44 +0000 (UTC) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B08FBE099F for ; Sun, 13 Oct 2013 09:07:43 +0000 (UTC) Received: by mail-pb0-f53.google.com with SMTP id up15so6109185pbc.12 for ; Sun, 13 Oct 2013 02:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S59B/sLYV9kaT+FMFR6EbqXsnWan9wd3ezTaF06InZk=; b=w+qXnmsqdUVFMLxZN64j+lLwE4eOtb8RhZ/NP+pW8kPOPEUePae19c07nifuXBy6s0 ea5Q+b508pHNKo7L3O37Da5Yu6pOe04cSu6AZaIBwJ2gJjhb2RP3kaVJ579t0hdhMs1t rYFny7rc5PQYbyrJ1gMML3YuBwT7jMtgK9yfSugFXDHWAx/DBvHTYgJmdu0CsR5zqxpg WGp2OxjzWUnr6+G974mpWMw+dViuPBDqtap4exREbBYZJTDXxstD1/mZn3KsP8ilELUq S3+AvS6LpVWEKTBhKWxKuboOJ/5Pg+2WxW2tpUGG2/Fc3kXecb0a8ten0KshBsD9ABL1 3m6g== X-Received: by 10.66.152.11 with SMTP id uu11mr31401939pab.124.1381655262530; Sun, 13 Oct 2013 02:07:42 -0700 (PDT) Received: from moiraine.shinigami ([50.126.105.238]) by mx.google.com with ESMTPSA id kd1sm82991001pab.20.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 13 Oct 2013 02:07:42 -0700 (PDT) From: Dylan Baker To: gentoo-catalyst@lists.gentoo.org Cc: Dylan Baker Subject: [gentoo-catalyst] [Patch v2 4/4] catalyst: Remove commented sections of code Date: Sun, 13 Oct 2013 02:07:38 -0700 Message-Id: <1381655258-6084-4-git-send-email-baker.dylan.c@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1381655258-6084-1-git-send-email-baker.dylan.c@gmail.com> References: <1381655258-6084-1-git-send-email-baker.dylan.c@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 1483f17d-832d-47aa-ae31-7f16227a78f5 X-Archives-Hash: 6e12dfe6007f1a7682b0291c24b25043 Code in the upstream tree should either run or it shouldn't be there. --- catalyst | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/catalyst b/catalyst index 36bd709..68fa109 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) -- 1.8.1.5