summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-11-11 15:11:18 -0400
committerJoey Hess2015-11-11 15:11:18 -0400
commit10c12d629650bed532d83b9f1c622a183ca45dab (patch)
treec3d11b8aeb89a15303ea49b8ea6c2eb930d9f9ed
parentd934e7aaa7f2066115b2934aafb9eb03be1668c7 (diff)
parentedf12c8643f2d7eef439efe36265ca9be6838938 (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog4
-rw-r--r--src/Propellor/Property/PropellorRepo.hs4
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index a3842571..e5bb541b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
propellor (2.13.1) UNRELEASED; urgency=medium
- * Add Propellor.Property.PropellorRepo.hasUrl, an explicit way to set the
- git repository url normally implicitly set when using --spin.
+ * Add Propellor.Property.PropellorRepo.hasOriginUrl, an explicit way to
+ set the git repository url normally implicitly set when using --spin.
-- Joey Hess <id@joeyh.name> Wed, 11 Nov 2015 13:37:00 -0400
diff --git a/src/Propellor/Property/PropellorRepo.hs b/src/Propellor/Property/PropellorRepo.hs
index 20c13df1..d4c4abe5 100644
--- a/src/Propellor/Property/PropellorRepo.hs
+++ b/src/Propellor/Property/PropellorRepo.hs
@@ -11,8 +11,8 @@ import Propellor.Git
--
-- This property is useful when hosts are being updated without using
-- --spin, eg when using the `Propellor.Property.Cron.runPropellor` cron job.
-hasUrl :: String -> Property NoInfo
-hasUrl u = property ("propellor repo url " ++ u) $ do
+hasOriginUrl :: String -> Property NoInfo
+hasOriginUrl u = property ("propellor repo url " ++ u) $ do
curru <- liftIO getRepoUrl
if curru == Just u
then return NoChange