diff options
| author | Todd Zullinger <tmz@pobox.com> | 2009-08-28 14:08:13 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2009-08-28 14:08:13 -0400 |
| commit | b834081493101080cf2001a3d87c7b6d7a47491d (patch) | |
| tree | 391d75d2cdaf1dfe6d6a33bf68280c30c1459f3e /puppet-host-package | |
| parent | 42cb7ade8c8b049cd46d7053fb514c6b4463cd19 (diff) | |
| download | puppet-host-package-b834081493101080cf2001a3d87c7b6d7a47491d.tar.gz puppet-host-package-b834081493101080cf2001a3d87c7b6d7a47491d.tar.xz puppet-host-package-b834081493101080cf2001a3d87c7b6d7a47491d.zip | |
Don't run cleanup() in rpm(), call it explicitly
Running cleanup() from rpm() made it impossible to create a tarball or
other package after rpm() was called because it deleted the tmpdir,
which was made a class variable in ae26808.
Diffstat (limited to 'puppet-host-package')
| -rwxr-xr-x | puppet-host-package | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet-host-package b/puppet-host-package index f609836..9ad8b7e 100755 --- a/puppet-host-package +++ b/puppet-host-package @@ -103,11 +103,13 @@ def _main(): if not os.path.exists(host.files['cert']) or opts.force_cert: try: host.gencert() except puppethost.PuppetHostError, error: + host.cleanup() print error continue try: host.package() except Exception, error: + host.cleanup() print error continue |