catalyst-verbose.patch

   1 Index: catalyst
   2 ===================================================================
   3 RCS file: /var/cvsroot/gentoo/src/catalyst/catalyst,v
   4 retrieving revision 1.162
   5 diff -u -p -r1.162 catalyst
   6 --- catalyst    2 Oct 2006 20:41:53 -0000       1.162
   7 +++ catalyst    24 Dec 2006 11:19:10 -0000
   8 @@ -86,51 +86,65 @@ def parse_config(myconfig):
   9         # now, load up the values into conf_values so that we can use them
  10         for x in confdefaults.keys():
  11                 if myconf.has_key(x):
  12 -                       print "Setting",x,"to config file value \""+myconf[x]+"\""
  13 +                       if verbose:
  14 +                               print "Setting",x,"to config file value \""+myconf[x]+"\""
  15                         conf_values[x]=myconf[x]
  16                 else:
  17 -                       print "Setting",x,"to default value \""+confdefaults[x]+"\""
  18 +                       if verbose:
  19 +                               print "Setting",x,"to default value \""+confdefaults[x]+"\""
  20                         conf_values[x]=confdefaults[x]
  21
  22 +       conf_values["sharedir"] = "/usr/local/gentoo/src/catalyst"
  23 +
  24         # parse out the rest of the options from the config file
  25         if "ccache" in string.split(conf_values["options"]):
  26 -               print "Compiler cache support enabled."
  27 +               if verbose:
  28 +                       print "Compiler cache support enabled."
  29                 conf_values["CCACHE"]="1"
  30
  31         if "pkgcache" in string.split(conf_values["options"]):
  32 -               print "Package cache support enabled."
  33 +               if verbose:
  34 +                       print "Package cache support enabled."
  35                 conf_values["PKGCACHE"]="1"
  36
  37         if "snapcache" in string.split(conf_values["options"]):
  38 -               print "Snapshot cache support enabled."
  39 +               if verbose:
  40 +                       print "Snapshot cache support enabled."
  41                 conf_values["SNAPCACHE"]="1"
  42
  43         if "seedcache" in string.split(conf_values["options"]):
  44 -               print "Seed cache support enabled."
  45 +               if verbose:
  46 +                       print "Seed cache support enabled."
  47                 conf_values["SEEDCACHE"]="1"
  48
  49         if "kerncache" in string.split(conf_values["options"]):
  50 -               print "Kernel cache support enabled."
  51 +               if verbose:
  52 +                       print "Kernel cache support enabled."
  53                 conf_values["KERNCACHE"]="1"
  54
  55         if "distcc" in string.split(conf_values["options"]):
  56 -               print "Distcc support enabled."
  57 +               if verbose:
  58 +                       print "Distcc support enabled."
  59                 conf_values["DISTCC"]="1"
  60
  61         if "autoresume" in string.split(conf_values["options"]):
  62 -               print "Autoresuming support enabled."
  63 +               if verbose:
  64 +                       print "Autoresuming support enabled."
  65                 conf_values["AUTORESUME"]="1"
  66
  67         if "purge" in string.split(conf_values["options"]):
  68 -               print "Purge support enabled."
  69 +               if verbose:
  70 +                       print "Purge support enabled."
  71                 conf_values["PURGE"]="1"
  72
  73         if "clear-autoresume" in string.split(conf_values["options"]):
  74 -               print "Cleaning autoresume flags support enabled."
  75 +               if verbose:
  76 +                       print "Cleaning autoresume flags support enabled."
  77                 conf_values["CLEAR_AUTORESUME"]="1"
  78
  79         if myconf.has_key("envscript"):
  80 -               print "Envscript support enabled."
  81 +               if verbose:
  82 +                       print "Envscript support enabled."
  83                 conf_values["ENVSCRIPT"]=myconf["envscript"]
  84
  85         if myconf.has_key("digests"):
  86 @@ -200,7 +214,6 @@ def build_target(addlargs, targetmap):
  87  if __name__ == "__main__":
  88         targetmap={}
  89
  90 -       version()
  91         if os.getuid() != 0:
  92                 # catalyst cannot be run as a normal user due to chroots, mounts, etc
  93                 print "!!! catalyst: This script requires root privileges to operate"
  94 @@ -280,6 +293,7 @@ if __name__ == "__main__":
  95                                 conf_values["FETCH"]="1"
  96
  97                 if o in ("-v", "--verbose"):
  98 +                       verbose = True
  99                         if len(sys.argv) < 3:
 100                                 print "!!! catalyst: please specify one of either -f or -C\n"
 101                                 usage()
 102 @@ -316,6 +330,9 @@ if __name__ == "__main__":
 103                 usage()
 104                 sys.exit(2)
 105
 106 +       if verbose:
 107 +               version()
 108 +
 109         # import configuration file and import our main module using those settings
 110         parse_config(myconfig)
 111         sys.path.append(conf_values["sharedir"]+"/modules")