From 791268cf1df3addb0e153ef1db1b906ac1e3bea9 Mon Sep 17 00:00:00 2001
From: Ryan Lane <rlane@wikimedia.org>
Date: Mon, 21 Jan 2013 14:15:40 -0800
Subject: [PATCH] Manually manage mediawiki's checkout

We're managing mediawiki via git, but ensuring latest is a bad
idea, since we're using the wmf branches, and not master. If we
use ensure => latest, vcsrepo will continuously switch the branch
to master.

Change-Id: Ibb6f8758224798e0e90f81bbb64da8cb7dffa03a
Reviewed-on: https://review.openstack.org/20184
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: matthew-wagoner <matthew.wagoner@hp.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/mediawiki/manifests/app.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mediawiki/manifests/app.pp b/modules/mediawiki/manifests/app.pp
index 0365fcd493..20ed95df4b 100644
--- a/modules/mediawiki/manifests/app.pp
+++ b/modules/mediawiki/manifests/app.pp
@@ -2,7 +2,7 @@
 #
 class mediawiki::app {
   vcsrepo { '/srv/mediawiki/w':
-    ensure   => latest,
+    ensure   => present,
     provider => git,
     source   => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
     revision => 'origin/master',