Please review pull request #263: Use Puppet::PUPPETVERSION to get version string opened by (glarizza)
Description:
Previously, git describe was being used to get the puppet version,
however this breaks the Jenkins builds. Puppet::PUPPETVERSION is
the better choice here (though we lose the 'rc' tags at the end).
- Opened: Fri Dec 09 00:25:17 UTC 2011
- Based on: puppetlabs:2.7.x (4af4e79c3b2b86566ada589112f53515a47676f7)
- Requested merge: glarizza:feature/2.7.x/Rakefile_DMG (e635ecbd1f9164be5a7f9b5c3cf26cdd48b384fb)
Diff follows:
diff --git a/tasks/rake/apple.rake b/tasks/rake/apple.rake
index 19e978f..a657b5e 100644
--- a/tasks/rake/apple.rake
+++ b/tasks/rake/apple.rake
@@ -21,12 +21,12 @@ PACKAGEMAKER = '/Developer/usr/bin/packagemaker'
SED = '/usr/bin/sed'
# Class Instance Variables
-@version = `git describe`.split('-')[0].chomp
+@version = Puppet::PUPPETVERSION
@title = "puppet-#{@version}"
@reverse_domain = 'com.puppetlabs.puppet'
@package_major_version = @version.split('.')[0]
@package_minor_version = @version.split('.')[1] +
- @version.split('.')[2].split('rc')[0]
+ @version.split('.')[2]
# Template-specific Variables
@pm_restart = 'None'
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
