Fixed/renamed improper file assignments

2 files changed, 13 insertions, 9 deletions

diff --git a/ipsutils/build.py b/ipsutils/build.py
index 9f7d11e..5889f85 100644
--- a/ipsutils/build.py
+++ b/ipsutils/build.py
@@ -17,6 +17,7 @@ import os.path
 #from __future__ import print_function
 from . import env, task
 from . import tpl
+from . import packaging 
 import stat
 import os
 import sys
@@ -151,7 +152,7 @@ class Build(env.Environment):
         template.close()
 
         # Generate intial IPS metadata file in buildroot
-        metadata = file(os.path.join(self.env_meta['METADATA']), 'w+')
+        metadata = file(os.path.join(self.env_meta['FILES']), 'w+')
         for line in output:
             metadata.writelines(line)
         metadata.close()
@@ -162,7 +163,7 @@ class Build(env.Environment):
                            'generate',
                            self.env_pkg['BUILDPROTO']]
         command_pkgfmt = [self.tool['pkgfmt']]
-        fp = file(self.env_meta['FILES'], 'w+')
+        fp = file(self.env_meta['FILES'], 'a')
         proc_pkg = subprocess.Popen(command_pkg,
                                         stdout=subprocess.PIPE)
         proc_pkgfmt = subprocess.Popen(command_pkgfmt,
@@ -179,14 +180,16 @@ class Build(env.Environment):
         command_pkg = [self.tool['pkgmogrify'],
                        '-DARCH={0:s}'.format(self.key_dict['arch']),
                        self.env_meta['FILES'],
-                       self.env_meta['METADATA']]
+                       self.env_meta['TRANS']]
         command_pkgfmt = [self.tool['pkgfmt']]
         fp = file(self.env_meta['TRANS'], 'w+')
         # Write %transforms block into transmogrification file
         # Proper syntax required.
-        for line in self.script_dict['attr']:
-            fp.write(line)
-
+        for line in self.script_dict['transforms']:
+            fp.writelines(string.join(line))
+        fp.close()
+        
+        fp = file(self.env_meta['FILES_PASS2'], 'w+')
         proc_pkg = subprocess.Popen(command_pkg,
                                         stdout=subprocess.PIPE)
         proc_pkgfmt = subprocess.Popen(command_pkgfmt,
@@ -194,6 +197,7 @@ class Build(env.Environment):
                                        stdout=fp)
         output, err = proc_pkgfmt.communicate()
         fp.close()
+        
         if output:
             for line in output:
                 print("{0:s}".format(line))
@@ -204,7 +208,7 @@ class Build(env.Environment):
                        'generate',
                        '-md',
                        self.env_pkg['BUILDPROTO'],
-                       self.env_meta['TRANS']]
+                       self.env_meta['FILES_PASS2']]
         command_pkgfmt = [self.tool['pkgfmt']]
         fp = file(self.env_meta['DEPENDS'], 'w+')
         proc_pkg = subprocess.Popen(command_pkg,
diff --git a/ipsutils/env.py b/ipsutils/env.py
index e2f7e88..6be69f0 100644
--- a/ipsutils/env.py
+++ b/ipsutils/env.py
@@ -53,9 +53,9 @@ class Environment(config.Config):
                 }
 
         self.env_meta = {
-                'METADATA': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.mog'),
+                'TRANS': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.mog'),
                 'FILES': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.1'),
-                'TRANS': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.2'),
+                'FILES_PASS2': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.2'),
                 'DEPENDS': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.3'),
                 'DEPENDSOLVE': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.3.res')
                 }