diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-09-05 11:54:52 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-09-05 11:54:52 -0700 |
| commit | 25ba5821b4ad0d747701dd5efa70f151238b7f75 (patch) | |
| tree | 636cef53ee2d627075f071b3f7d1dde5a06495a2 | |
| parent | 25547675038708e6925849c8caf7ad208d35a4ee (diff) | |
add UNRELEASED-arch-sbuild alias for dgit
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9ee8f6e7..423d98da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ propellor (3.1.3) UNRELEASED; urgency=medium + * Sbuild.built: add an additional alias to sid chroots for compatibility with + dgit * Fix Sbuild.hs haddock formatting error. -- Sean Whitton <spwhitton@spwhitton.name> Mon, 05 Sep 2016 11:14:52 -0700 diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 102f5387..55e764f9 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -190,7 +190,12 @@ built s@(SbuildSchroot suite arch) mirror = Just (System _ hostArch) -> if suite == "unstable" && hostArch == arch then ensureProperty w $ - schrootConf s `File.containsLine` aliases + ConfFile.containsIniSetting + (schrootConf s) + ( show s ++ "-sbuild" + , "aliases" + , aliases + ) else return NoChange -- If the user has indicated that this host should use @@ -217,7 +222,21 @@ built s@(SbuildSchroot suite arch) mirror = , return False ) - aliases = "aliases=UNRELEASED,sid,rc-buggy,experimental" + aliases = intercalate "," + [ "sid" + -- if the user wants to build for experimental, they would use + -- their sid chroot and sbuild's --extra-repository option to + -- enable experimental + , "rc-buggy" + , "experimental" + -- we assume that building for UNRELEASED means building for + -- unstable + , "UNRELEASED" + -- the following is for dgit compatibility: + , "UNRELEASED-" + ++ architectureToDebianArchString arch + ++ "-sbuild" + ] -- | Ensure that an sbuild schroot's packages and apt indexes are updated -- |