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 4F1171381F3 for ; Fri, 11 Oct 2013 17:39:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 038D5E09B0; Fri, 11 Oct 2013 17:38:58 +0000 (UTC) Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FFF2E09B0 for ; Fri, 11 Oct 2013 17:38:57 +0000 (UTC) Received: by mail-pd0-f174.google.com with SMTP id y13so4561028pdi.33 for ; Fri, 11 Oct 2013 10:38:56 -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=KKBxWNzo82a3rKoSwRXOMlm11ThKCTJrE5Lh5IBNIBs=; b=B+z1g+g6sgm4VY0d5rPjIzChK1IVclrmSrJmC06y8m7oMHkIClDp12GigUPYwTGtpO e4Q1bOS2Zl8YM+GzbmWLJ803mUX8I3YYIzuAd7E4VkPFpX1XeLZhS19If0pZNID5lfjF ZuZ1SW/3fZtrZ3oOhexgA0TI68xCz+NvqkVvN6SV/FlU3NSaSeltJM7S4FRFCP7cTLH6 niMS3nhRgipOhZV53IwkCuyKs/KH+n6CXe05ZSs99Ka/KjwA4eocTyT/OTkK5MEVL6wQ 3uizwcD6730iUmgtpR4moqhgpakV3BdUySgboJQ8huOpDSKW3yBAL2yuvK26h8P2kqc3 3brA== X-Received: by 10.66.192.132 with SMTP id hg4mr23212370pac.84.1381513136377; Fri, 11 Oct 2013 10:38:56 -0700 (PDT) Received: from localhost.localdomain (75-92-167-159.war.clearwire-wmx.net. [75.92.167.159]) by mx.google.com with ESMTPSA id gg10sm61128484pbc.46.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:38:55 -0700 (PDT) From: Dylan Baker To: gentoo-catalyst@lists.gentoo.org Cc: Dylan Baker Subject: [gentoo-catalyst] [PATCH 4/4] catalyst: Remove commented sections of code Date: Fri, 11 Oct 2013 10:38:27 -0700 Message-Id: <1381513107-17483-4-git-send-email-baker.dylan.c@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1381513107-17483-1-git-send-email-baker.dylan.c@gmail.com> References: <1381513107-17483-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: f9505ad4-ef3a-493b-8a98-16a95cedf4c4 X-Archives-Hash: e5b8bd72d815d3924f69cfa2592abfc4 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 406250c..7d78e46 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