From 90219e30615e09779469ceae272cf41943d43585 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 19 Feb 2016 14:15:19 -0400 Subject: trademark nonsense Removed references to *buntu from code and documentation because of an unfortunate trademark use policy. http://joeyh.name/blog/entry/trademark_nonsense/ That included changing a data constructor to "FooBuntu", an API change. --- debian/changelog | 6 +++++- .../comment_1_f324bed708305e2667bd00f80544dd90._comment | 4 ++-- propellor.cabal | 2 +- src/Propellor/Property.hs | 2 +- src/Propellor/Property/Chroot.hs | 2 +- src/Propellor/Property/Debootstrap.hs | 6 +++--- src/Propellor/Property/OS.hs | 4 ++-- src/Propellor/Types/OS.hs | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index a9fa5593..cf74edaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -propellor (2.15.5) UNRELEASED; urgency=medium +propellor (2.16.0) UNRELEASED; urgency=medium * Obnam: Only let one backup job run at a time when a host has multiple different backup properties, to avoid concurrent jobs fighting over scarce resources (particularly memory). Other jobs block on a lock file. + * Removed references to *buntu from code and documentation because of + an unfortunate trademark use policy. + http://joeyh.name/blog/entry/trademark_nonsense/ + * That included changing a data constructor to "FooBuntu", an API change. -- Joey Hess Fri, 19 Feb 2016 11:29:53 -0400 diff --git a/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment b/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment index 5c03304b..ed972c01 100644 --- a/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment +++ b/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment @@ -7,13 +7,13 @@ I have heard of propellor being used on OSX. Probably that user wrote their own code for OSX specific stuff. Propellor properites can be parameterized by OS. Currently it has support -for Debian and some untested support for Ubuntu. A property can be parameterized +for Debian and some untested support for *buntu. A property can be parameterized like this: foo :: Property foo = property "foo" withOS desc $ \o -> case o of (Just (System (Debian _) _)) -> ensureProperty fooDebian - (Just (System (Ubuntu _) _)) -> ensureProperty fooUbuntu + (Just (System (FooBuntu _) _)) -> ensureProperty fooBuntu The first step for adding a new OS will be to modify . Compilation will then warn about all OS parameterized properties that diff --git a/propellor.cabal b/propellor.cabal index 3e6c3c37..4d8e7f26 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.15.4 +Version: 2.16.0 Cabal-Version: >= 1.8 License: BSD3 Maintainer: Joey Hess diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index a83bffc4..eee1409c 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -255,7 +255,7 @@ isNewerThan x y = do -- -- > myproperty = withOS "foo installed" $ \o -> case o of -- > (Just (System (Debian suite) arch)) -> ... --- > (Just (System (Ubuntu release) arch)) -> ... +-- > (Just (System (FooBuntu release) arch)) -> ... -- > Nothing -> ... withOS :: Desc -> (Maybe System -> Propellor Result) -> Property NoInfo withOS desc a = property desc $ a =<< getOS diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index cfa70e9f..44d7036d 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -90,7 +90,7 @@ data Debootstrapped = Debootstrapped Debootstrap.DebootstrapConfig instance ChrootBootstrapper Debootstrapped where buildchroot (Debootstrapped cf) system loc = case system of (Just s@(System (Debian _) _)) -> Right $ debootstrap s - (Just s@(System (Ubuntu _) _)) -> Right $ debootstrap s + (Just s@(System (FooBuntu _) _)) -> Right $ debootstrap s Nothing -> Left "Cannot debootstrap; `os` property not specified" where debootstrap s = Debootstrap.built loc s cf diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index 61912b32..445c0629 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -91,7 +91,7 @@ built' installprop target system@(System _ arch) config = extractSuite :: System -> Maybe String extractSuite (System (Debian s) _) = Just $ Apt.showSuite s -extractSuite (System (Ubuntu r) _) = Just r +extractSuite (System (FooBuntu r) _) = Just r -- | Ensures debootstrap is installed. -- @@ -108,12 +108,12 @@ installed = install remove ) installon (Just (System (Debian _) _)) = aptinstall - installon (Just (System (Ubuntu _) _)) = aptinstall + installon (Just (System (FooBuntu _) _)) = aptinstall installon _ = sourceInstall remove = withOS "debootstrap removed" $ ensureProperty . removefrom removefrom (Just (System (Debian _) _)) = aptremove - removefrom (Just (System (Ubuntu _) _)) = aptremove + removefrom (Just (System (FooBuntu _) _)) = aptremove removefrom _ = sourceRemove aptinstall = Apt.installed ["debootstrap"] diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs index 1f22888c..403b1df3 100644 --- a/src/Propellor/Property/OS.hs +++ b/src/Propellor/Property/OS.hs @@ -85,8 +85,8 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $ osbootstrapped = withOS (newOSDir ++ " bootstrapped") $ \o -> case o of (Just d@(System (Debian _) _)) -> debootstrap d - (Just u@(System (Ubuntu _) _)) -> debootstrap u - _ -> error "os is not declared to be Debian or Ubuntu" + (Just u@(System (FooBuntu _) _)) -> debootstrap u + _ -> error "os is not declared to be Debian or *buntu" debootstrap targetos = ensureProperty $ -- Ignore the os setting, and install debootstrap from diff --git a/src/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs index 447d4396..6c2dd28e 100644 --- a/src/Propellor/Types/OS.hs +++ b/src/Propellor/Types/OS.hs @@ -24,7 +24,7 @@ data System = System Distribution Architecture data Distribution = Debian DebianSuite - | Ubuntu Release + | FooBuntu Release -- ^ "*buntu" (The actual name of this distribution is not used in Propellor per ) deriving (Show, Eq) -- | Debian has several rolling suites, and a number of stable releases, -- cgit v1.2.3