Add __version__ check

4 files changed, 33 insertions, 14 deletions

diff --git a/ipsutils/__init__.py b/ipsutils/__init__.py
index 0ca8f44..2498649 100644
--- a/ipsutils/__init__.py
+++ b/ipsutils/__init__.py
@@ -1,7 +1,14 @@
+import os.path
 from . import env
 from . import config
 from . import build
 from . import task
 
+
+if os.path.exists(os.path.join('ipsutils', 'version.py')):
+    from version import __version__
+else:
+    __version__ = '0.0.0'
+
 if __name__ == '__main__':
     pass
\ No newline at end of file
diff --git a/ipsutils/build.py b/ipsutils/build.py
index 5889f85..9cc71e7 100644
--- a/ipsutils/build.py
+++ b/ipsutils/build.py
@@ -29,11 +29,14 @@ import tempfile
 
 
 class Build(env.Environment):
-    def __init__(self, ipsfile):
+    def __init__(self, ipsfile, *args, **kwargs):
         # Parent Config parses configuration data in .ips file
         # Inherited members are used to populate package information
         # as well as build tasks
         super(Build, self).__init__(ipsfile)
+        
+        if 'options' in kwargs:
+            self.options = kwargs['options']
 
         os.chdir(self.env['IPSBUILD'])
         # Create list of build tasks
@@ -70,13 +73,15 @@ class Build(env.Environment):
                     # from within the configuration class
                     t = string.Template(string.join(line))
                     line = t.safe_substitute(self.env_pkg)
-                    #print("+ {0:s}".format(line))
                     fp_tempfile.write(line + '\n')
+                    if self.options.verbose:
+                        print(">>> {0:s}".format(line))
         fp_tempfile.flush()
         os.chmod(fp_tempfile.name, 0755)
         script = [fp_tempfile.name]
         proc = subprocess.Popen(script, stdout=sys.stdout)
         err = proc.wait()
+        fp_tempfile.close()
         
         os.chdir(self.env['IPSBUILD'])
         return err
@@ -103,7 +108,8 @@ class Build(env.Environment):
         for k, v in ext.items():
             if k in path:
                 cmd = v.split()
-                print(string.join(cmd))
+                if self.options.verbose:
+                    print(string.join(cmd))
                 proc = subprocess.Popen(cmd)
                 err = proc.wait()
                 break
@@ -154,6 +160,8 @@ class Build(env.Environment):
         # Generate intial IPS metadata file in buildroot
         metadata = file(os.path.join(self.env_meta['FILES']), 'w+')
         for line in output:
+            if self.options.verbose:
+                print(">>> {0:s}".format(line))                        
             metadata.writelines(line)
         metadata.close()
         return True
@@ -171,9 +179,10 @@ class Build(env.Environment):
                                        stdout=fp)
         output, err = proc_pkgfmt.communicate()
         fp.close()
-        if output:
-            for line in output:
-                print("{0:s}".format(line))
+        if self.options.verbose:
+            if output:
+                for line in output:
+                    print(">>> {0:s}".format(line))
         return err
 
     def manifest_mogrify(self, *p):
@@ -198,9 +207,10 @@ class Build(env.Environment):
         output, err = proc_pkgfmt.communicate()
         fp.close()
         
-        if output:
-            for line in output:
-                print("{0:s}".format(line))
+        if self.options.verbose:
+            if output:
+                for line in output:
+                    print(">>> {0:s}".format(line))
         return err
 
     def manifest_depends(self, *p):
@@ -218,9 +228,10 @@ class Build(env.Environment):
                                        stdout=fp)
         output, err = proc_pkgfmt.communicate()
         fp.close()
-        if output:
-            for line in output:
-                print("{0:s}".format(line))
+        if self.options.verbose:
+            if output:
+                for line in output:
+                    print(">>> {0:s}".format(line))
         return err
 
     def manifest_depends_resolve(self, *p):
@@ -228,7 +239,7 @@ class Build(env.Environment):
                        'resolve',
                        '-m',
                        self.env_meta['DEPENDS']]
-        proc_pkg = subprocess.Popen(command_pkg)
+        proc_pkg = subprocess.Popen(command_pkg, stderr=subprocess.STDOUT)
         err = proc_pkg.wait()
         return err
 
diff --git a/ipsutils/task.py b/ipsutils/task.py
index 7b45309..407eac9 100644
--- a/ipsutils/task.py
+++ b/ipsutils/task.py
@@ -30,7 +30,7 @@ class TaskController(object):
             status = stack_entry.run()
             if type(status) == type(True):
                 if not status:
-                    print("Internal error: {0:s}".format(status))
+                    print("Internal error: {0:d}".format(status))
                     exit(status)
             else:
                 if status > 0:
diff --git a/ipsutils/version.py b/ipsutils/version.py
new file mode 100644
index 0000000..e1424ed
--- /dev/null
+++ b/ipsutils/version.py
@@ -0,0 +1 @@
+__version__ = '0.3.1'