From 0efe2afba377d4144d8b227dfa0e81f8fb5ed99b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Sep 2012 19:13:47 -0300
Subject: Avoiding duplicate definition of git-annex

---
 manifests/subsystems/utils/development.pp | 6 ++++--
 manifests/subsystems/utils/storage.pp     | 6 ++++++
 manifests/subsystems/utils/web.pp         | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'manifests/subsystems')

diff --git a/manifests/subsystems/utils/development.pp b/manifests/subsystems/utils/development.pp
index 7154e36..ce900ed 100644
--- a/manifests/subsystems/utils/development.pp
+++ b/manifests/subsystems/utils/development.pp
@@ -6,8 +6,10 @@ class utils::development {
               'devscripts', 'pbuilder',         'build-essential', 'pnopaste-cli',      'agave',
               'cdbs',       'dh-buildinfo',     'quilt',           'dpatch',            'dput',
               'bzr',        'debian-goodies',   'debirf',          'xorriso',           'dh-autoreconf',
-              'git-annex',  'git-buildpackage', 'gem2deb',         'python-setuptools', 'python-virtualenv',
-              'ditz',       'unetbootin' ]:
+              'unetbootin', 'git-buildpackage', 'gem2deb',         'python-setuptools', 'python-virtualenv',
+              'ditz' ]:
     ensure => installed,
   }
+
+  include utils::storage::archive
 }
diff --git a/manifests/subsystems/utils/storage.pp b/manifests/subsystems/utils/storage.pp
index e83873b..6a52e16 100644
--- a/manifests/subsystems/utils/storage.pp
+++ b/manifests/subsystems/utils/storage.pp
@@ -4,3 +4,9 @@ class utils::storage {
     ensure => installed,
   }
 }
+
+class utils::storage::archive {
+  package { 'git-annex':
+    ensure => installed,
+  }
+}
diff --git a/manifests/subsystems/utils/web.pp b/manifests/subsystems/utils/web.pp
index 9169ef0..8b0eba9 100644
--- a/manifests/subsystems/utils/web.pp
+++ b/manifests/subsystems/utils/web.pp
@@ -2,7 +2,9 @@
 class utils::web {
   package { [ 'ffmpeg',  'flvtool2',             'curl',                'rake',
               'libxml2', 'libxml2-dev',          'libxslt1-dev',        'libmysqlclient-dev',
-              'g++',     'libcurl4-openssl-dev', 'apache2-prefork-dev', 'git-annex' ]:
+              'g++',     'libcurl4-openssl-dev', 'apache2-prefork-dev' ]:
     ensure => installed,
   }
+
+  include utils::storage::archive
 }
-- 
cgit v1.2.3