diff options
| author | Heikki Halmet <heikki.halmet@digia.com> | 2013-04-24 14:56:33 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-06 07:04:02 +0200 |
| commit | b49400dc65a1cb6be0bd032e879d3d755cd20a48 (patch) | |
| tree | 1f70d6e8ed5cf43ca0ed28781d631946018eb584 | |
| parent | 8b420f468723c3c73241ea49c195cf8e1425e760 (diff) | |
Fix when requiring Class sevenzip
This will fix require of Sevenzip in modules Unzip_package and in
Zip_package. Install of 7z package removed from qt_prereqs to
sevenzip module
Change-Id: Iaa2dc28a543aa4750779978727861e0053a83176
Reviewed-by: Tony SarajΓ€rvi <tony.sarajarvi@digia.com>
| -rw-r--r-- | puppet/modules/qt_prereqs/manifests/linux.pp | 6 | ||||
| -rw-r--r-- | puppet/modules/sevenzip/manifests/init.pp | 7 | ||||
| -rw-r--r-- | puppet/modules/sevenzip/manifests/linux.pp | 6 | ||||
| -rw-r--r-- | puppet/modules/unzip_package/manifests/init.pp | 4 |
4 files changed, 12 insertions, 11 deletions
diff --git a/puppet/modules/qt_prereqs/manifests/linux.pp b/puppet/modules/qt_prereqs/manifests/linux.pp index d3e87ad..f5d910c 100644 --- a/puppet/modules/qt_prereqs/manifests/linux.pp +++ b/puppet/modules/qt_prereqs/manifests/linux.pp @@ -10,17 +10,11 @@ class qt_prereqs::linux inherits qt_prereqs::unix { default => "git", } - $sevenzip = $::operatingsystem ? { - Ubuntu => "p7zip-full", - default => "p7zip", - } - package { "$git": ensure => installed; "$gstreamer": ensure => installed; "chrpath": ensure => installed; "lsb": ensure => installed; - "$sevenzip": ensure => installed; "libasound2-dev": ensure => installed; "libbluetooth-dev": ensure => installed; diff --git a/puppet/modules/sevenzip/manifests/init.pp b/puppet/modules/sevenzip/manifests/init.pp index b33ccf4..1d6685d 100644 --- a/puppet/modules/sevenzip/manifests/init.pp +++ b/puppet/modules/sevenzip/manifests/init.pp @@ -1,6 +1,7 @@ class sevenzip { case $::kernel { - windows: { include sevenzip::windows } - Darwin: { include sevenzip::mac } + windows: { require sevenzip::windows } + Darwin: { require sevenzip::mac } + Linux: { require sevenzip::linux } } -} +}
\ No newline at end of file diff --git a/puppet/modules/sevenzip/manifests/linux.pp b/puppet/modules/sevenzip/manifests/linux.pp new file mode 100644 index 0000000..ed09cf3 --- /dev/null +++ b/puppet/modules/sevenzip/manifests/linux.pp @@ -0,0 +1,6 @@ +class sevenzip::linux +{ + package { "p7zip": + ensure => installed, + } +}
\ No newline at end of file diff --git a/puppet/modules/unzip_package/manifests/init.pp b/puppet/modules/unzip_package/manifests/init.pp index 208b644..b8d0a13 100644 --- a/puppet/modules/unzip_package/manifests/init.pp +++ b/puppet/modules/unzip_package/manifests/init.pp @@ -47,7 +47,7 @@ define unzip_package( $msysbin = $::architecture ? { x64 => 'c:\Program Files (x86)\Git\bin', default => 'c:\Program Files\Git\bin' - } + } $curl = "\"$msysbin\\curl.exe\"" $grep = "\"$msysbin\\grep.exe\"" } else { @@ -88,5 +88,5 @@ define unzip_package( logoutput => true, timeout => 3600, require => Class['sevenzip'] - } + } } |