diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-04 11:32:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-04 11:32:26 -0400 |
| commit | 07e007db294b7dcb22142811a49e2c65a2070a9b (patch) | |
| tree | 8d95a953c2bd7dd78fc7c9fccd5560ad942fdc8e | |
| parent | 77a2290d3ac81cbe5246e2ee76d2235619d33b39 (diff) | |
Bootstrap.clonedFrom: Fix bug that broke copying .git/config into chroot.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Bootstrap.hs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index be8ae96e..29eb985e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ propellor (4.0.7) UNRELEASED; urgency=medium exposed. * Bugfix: Apache.httpsVirtualHost' must create ssl/hn/ dir earlier Thanks, Sean Whitton. + * Bootstrap.clonedFrom: Fix bug that broke copying .git/config into + chroot. -- Joey Hess <id@joeyh.name> Tue, 20 Jun 2017 10:55:37 -0400 diff --git a/src/Propellor/Property/Bootstrap.hs b/src/Propellor/Property/Bootstrap.hs index 5678a865..c6abe6b6 100644 --- a/src/Propellor/Property/Bootstrap.hs +++ b/src/Propellor/Property/Bootstrap.hs @@ -83,7 +83,7 @@ clonedFrom reposource = case reposource of -- configuration. copygitconfig :: Property Linux copygitconfig = property ("Propellor repo git config copied from outside the chroot") $ do - let gitconfig = localdir <> ".git" <> "config" + let gitconfig = localdir </> ".git" </> "config" cfg <- liftIO $ B.readFile gitconfig exposeTrueLocaldir $ const $ liftIO $ B.writeFile gitconfig cfg |