[gentoo-commits] proj/metagen:master commit in: metagen/

[gentoo-commits] proj/metagen:master commit in: metagen/

[Jesus Rivero]

commit:     ddf1d9bb078a010915d576fb1ce50024c836fa2d
Author:     Jesus Rivero (Neurogeek) <jer <AT> acla-overseas <DOT> com>
AuthorDate: Sat Aug 13 18:06:30 2011 +0000
Commit:     Jesus Rivero <neurogeek <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 18:06:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=commit;h=ddf1d9bb

Added checks for HERD existance

---
 metagen/main.py |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/metagen/main.py b/metagen/main.py
index 06f0239..22abbd5 100755
--- a/metagen/main.py
+++ b/metagen/main.py
@@ -1,31 +1,31 @@
 #!/usr/bin/python
 
-
 """
 
 NAME     - metagen
-
 SYNOPSIS - Adds metadata.xml to current directory
-
-AUTHOR   - Rob Cakebread <pythonhead@gentoo.org>
-
+AUTHOR   - Rob Cakebread <cakebread@gmail.com>
+AUTHOR   - Jesus Rivero <neurogeek@gentoo.org>
 USE      - metagen --help
-
 EXAMPLES - man metagen
 
 """
 
-import sys
 import re
 import os
+import sys
 from optparse import OptionParser
 from commands import getstatusoutput
 
+from portage import config
+from repoman import herdbase
 from portage.output import red, blue
 
 from metagen.version import __version__
 from metagen import metagenerator
 
+PORTDIR = config(local_config=False)["PORTDIR"]
+HB = herdbase.make_herd_base(os.path.sep.join([PORTDIR, 'metadata', 'herds.xml']))
 
 def parse_echangelog_variable(name, email):
     """Extract developer name and email from ECHANGELOG_USER variable"""
@@ -64,6 +64,12 @@ def generate_xml(options):
         herds = options.herd.split(",")
     else:
         herds = ["no-herd"]
+
+    for herd in herds:
+        if not HB.known_herd(herd):
+            print red("!!! Error. Herd %s does not exist." % herd)
+            sys.exit(1) 
+            
     metadata.set_herd(herds)
 
     if options.echangelog:

[gentoo-commits] proj/metagen:v0.6 commit in: metagen/

[Jesus Rivero]

commit:     ddf1d9bb078a010915d576fb1ce50024c836fa2d
Author:     Jesus Rivero (Neurogeek) <jer <AT> acla-overseas <DOT> com>
AuthorDate: Sat Aug 13 18:06:30 2011 +0000
Commit:     Jesus Rivero <neurogeek <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 18:06:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=commit;h=ddf1d9bb

Added checks for HERD existance

---
 metagen/main.py |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/metagen/main.py b/metagen/main.py
index 06f0239..22abbd5 100755
--- a/metagen/main.py
+++ b/metagen/main.py
@@ -1,31 +1,31 @@
 #!/usr/bin/python
 
-
 """
 
 NAME     - metagen
-
 SYNOPSIS - Adds metadata.xml to current directory
-
-AUTHOR   - Rob Cakebread <pythonhead@gentoo.org>
-
+AUTHOR   - Rob Cakebread <cakebread@gmail.com>
+AUTHOR   - Jesus Rivero <neurogeek@gentoo.org>
 USE      - metagen --help
-
 EXAMPLES - man metagen
 
 """
 
-import sys
 import re
 import os
+import sys
 from optparse import OptionParser
 from commands import getstatusoutput
 
+from portage import config
+from repoman import herdbase
 from portage.output import red, blue
 
 from metagen.version import __version__
 from metagen import metagenerator
 
+PORTDIR = config(local_config=False)["PORTDIR"]
+HB = herdbase.make_herd_base(os.path.sep.join([PORTDIR, 'metadata', 'herds.xml']))
 
 def parse_echangelog_variable(name, email):
     """Extract developer name and email from ECHANGELOG_USER variable"""
@@ -64,6 +64,12 @@ def generate_xml(options):
         herds = options.herd.split(",")
     else:
         herds = ["no-herd"]
+
+    for herd in herds:
+        if not HB.known_herd(herd):
+            print red("!!! Error. Herd %s does not exist." % herd)
+            sys.exit(1) 
+            
     metadata.set_herd(herds)
 
     if options.echangelog: