summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-02-25 17:26:41 -0400
committerJoey Hess2016-02-25 17:29:33 -0400
commite885431da416d26e01454edf47fefbc0777dcbdd (patch)
tree6c9d012394e4e00aa12eb1590b84f15265cb4b8d
parent88a6e57c010dbb1a2ebb9b33d827f52fe6a0d25a (diff)
FooBuntu -> Buntish
Seems that Canonical have trademarked numerous words ending in "buntu", and would like to trademark anything ending in that to the extent their lawyers can make that happen.
-rw-r--r--debian/changelog6
-rw-r--r--doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment2
-rw-r--r--src/Propellor/Property.hs2
-rw-r--r--src/Propellor/Property/Chroot.hs2
-rw-r--r--src/Propellor/Property/Debootstrap.hs6
-rw-r--r--src/Propellor/Property/OS.hs2
-rw-r--r--src/Propellor/Types/OS.hs2
7 files changed, 11 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index a7f38a96..bd4e2908 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,10 @@ propellor (2.16.0) UNRELEASED; urgency=medium
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.
+ * Removed references to a Debian derivative 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.
+ * That included changing a data constructor to "Buntish", an API change.
* Firewall: add InIFace/OutIFace Rules, add Source/Destination Rules,
add CustomTarget, and more improvements.
Thanks, FĂ©lix Sipma.
diff --git a/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment b/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment
index ed972c01..7649e95e 100644
--- a/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment
+++ b/doc/forum/Supported_OS/comment_1_f324bed708305e2667bd00f80544dd90._comment
@@ -13,7 +13,7 @@ like this:
foo :: Property
foo = property "foo" withOS desc $ \o -> case o of
(Just (System (Debian _) _)) -> ensureProperty fooDebian
- (Just (System (FooBuntu _) _)) -> ensureProperty fooBuntu
+ (Just (System (Buntish _) _)) -> ensureProperty fooBuntu
The first step for adding a new OS will be to modify <http://hackage.haskell.org/package/propellor/docs/Propellor-Types-OS.html>.
Compilation will then warn about all OS parameterized properties that
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index eee1409c..fe99a3fd 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 (FooBuntu release) arch)) -> ...
+-- > (Just (System (Buntish 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 44d7036d..e0ff477d 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 (FooBuntu _) _)) -> Right $ debootstrap s
+ (Just s@(System (Buntish _) _)) -> 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 445c0629..6a566853 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 (FooBuntu r) _) = Just r
+extractSuite (System (Buntish r) _) = Just r
-- | Ensures debootstrap is installed.
--
@@ -108,12 +108,12 @@ installed = install <!> remove
)
installon (Just (System (Debian _) _)) = aptinstall
- installon (Just (System (FooBuntu _) _)) = aptinstall
+ installon (Just (System (Buntish _) _)) = aptinstall
installon _ = sourceInstall
remove = withOS "debootstrap removed" $ ensureProperty . removefrom
removefrom (Just (System (Debian _) _)) = aptremove
- removefrom (Just (System (FooBuntu _) _)) = aptremove
+ removefrom (Just (System (Buntish _) _)) = aptremove
removefrom _ = sourceRemove
aptinstall = Apt.installed ["debootstrap"]
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index 403b1df3..5678b818 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -85,7 +85,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
osbootstrapped = withOS (newOSDir ++ " bootstrapped") $ \o -> case o of
(Just d@(System (Debian _) _)) -> debootstrap d
- (Just u@(System (FooBuntu _) _)) -> debootstrap u
+ (Just u@(System (Buntish _) _)) -> debootstrap u
_ -> error "os is not declared to be Debian or *buntu"
debootstrap targetos = ensureProperty $
diff --git a/src/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs
index 6c2dd28e..c302d11d 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
- | FooBuntu Release -- ^ "*buntu" (The actual name of this distribution is not used in Propellor per <http://joeyh.name/blog/entry/trademark_nonsense/>)
+ | Buntish Release -- ^ A well-known Debian derivative founded by a space tourist. The actual name of this distribution is not used in Propellor per <http://joeyh.name/blog/entry/trademark_nonsense/>)
deriving (Show, Eq)
-- | Debian has several rolling suites, and a number of stable releases,