From: John P. Davis Date: Thu, 9 Sep 2004 05:09:11 +0000 (+0000) Subject: bugfixes for #63382 and #63338 X-Git-Tag: CATALYST_2_0_6_916~939 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b3b9482e555460abdc26b85e1592c4f488d533a4;p=catalyst.git bugfixes for #63382 and #63338 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@434 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 14d0abec..28ecb5be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.81 2004/09/08 15:58:12 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.82 2004/09/09 05:09:11 zhen Exp $ + + 09 Sep 2004; John Davis catalyst: + bugfixes for #63382 and #63338 08 Sep 2004; John Davis livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, diff --git a/catalyst b/catalyst index 75228355..943b047e 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.44 2004/07/12 15:01:17 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.45 2004/09/09 05:09:11 zhen Exp $ # Maintained in full by John Davis @@ -21,6 +21,14 @@ def usage(): print " -C --cli catalyst commandline (MUST BE LAST OPTION)" print " -f --file read specfile" print " -V --verbose verbose output" + print + print "Build examples:" + print + print "Using the commandline option (-C, --cli) to build a Portage snapshot:" + print "catalyst -C target=snapshot version_stamp=my_date" + print + print "Using the specfile option (-f, --file) to build a stage target:" + print "catalyst -f stage1-specfile.spec" def version(): print "Gentoo Catalyst, version "+__version__ @@ -185,7 +193,11 @@ if __name__ == "__main__": myconfig="" myspecfile="" mycmdline=[] - + + if len(opts) == 0: + print "!!! catalyst: please specify one of either -f or -C" + sys.exit(2) + for o, a in opts: if o in ("-h", "--help"): usage() @@ -212,7 +224,7 @@ if __name__ == "__main__": if o in ("-V", "--verbose"): conf_values["VERBOSE"]="1" - + # import configuration file and import our main module using those settings parse_config(myconfig) sys.path.append(conf_values["sharedir"]+"/modules") @@ -232,3 +244,4 @@ if __name__ == "__main__": build_target(addlargs, targetmap) except: print "!!! catalyst: could not complete build" + sys.exit(2)