diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2013-12-23 13:12:05 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2013-12-23 13:12:05 -0500 |
| commit | cdf662542011453726507eed0dd6e54b0a3be0d0 (patch) | |
| tree | 499e49a902a295b9cfceeeb5f28f6eb51e0d70ff /ipsutils/env.py | |
| parent | 99dd411cb051db8ba4913f0df02cac300c635433 (diff) | |
| download | ipsutils-cdf662542011453726507eed0dd6e54b0a3be0d0.tar.gz | |
Use native shell trace. Fix templating bug. Fix BUILD dir extract into root bug.
Diffstat (limited to 'ipsutils/env.py')
| -rw-r--r-- | ipsutils/env.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ipsutils/env.py b/ipsutils/env.py index 0551b3c..d509a00 100644 --- a/ipsutils/env.py +++ b/ipsutils/env.py @@ -48,15 +48,22 @@ class Environment(config.Config): } # complete_name is required to build proper path names. - self.complete_name = self.key_dict['name'] + '-' + self.key_dict['version'] + self.complete_name = self.key_dict['name'] + '-' + \ + self.key_dict['version'] + + build_name = self.complete_name if self.key_dict['badpath']: - self.complete_name = self.key_dict['badpath'] - + build_name = self.key_dict['badpath'] + + if self.key_dict['repackage']: + self.complete_name = self.key_dict['repackage'] + '-' + \ + self.key_dict['version'] + '-' + self.key_dict['release'] + # Dictionary of package-level directories self.env_pkg = { 'BUILDROOT': os.path.join(self.env['BUILDROOT'], self.complete_name), 'BUILDPROTO': os.path.join(self.env['BUILDROOT'], self.complete_name, 'root'), - 'BUILD': os.path.join(self.env['BUILD'], self.complete_name), + 'BUILD': os.path.join(self.env['BUILD'], build_name), 'SOURCES': os.path.join(self.env['SOURCES'], os.path.basename(self.key_dict['source_url'])), 'PKGS': os.path.join(self.env['PKGS'], self.complete_name), 'SPKGS': os.path.join(self.env['SPKGS'], self.complete_name) |