summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-30propellor spinJoey Hess
2015-12-30propellor spinJoey Hess
2015-12-30commentJoey Hess
2015-12-30Merge branch 'joeyconfig'Joey Hess
2015-12-30changeogJoey Hess
2015-12-30add GNUPGBIN environment variableFélix Sipma
(cherry picked from commit dc3c55355246ec00782d636105871fe461587256)
2015-12-29Merge branch 'joeyconfig'Joey Hess
2015-12-29Add convenience .installed for lightdm.Jelmer Vernooij
Signed-off-by: Jelmer Vernooij <jelmer@jelmer.uk>
2015-12-28mergedJoey Hess
2015-12-28Merge branch 'master' of ssh://propellor.branchable.comJoey Hess
2015-12-28Merge branch 'joeyconfig'Joey Hess
2015-12-28Makefile: move redirection to silence xargsSean Whitton
When hothasktags not installed. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> (cherry picked from commit a23c8b42b3e901da05e5de26ba9a2a4207d839f2)
2015-12-28pull requestspwhitton
2015-12-19cleanupJoey Hess
2015-12-19Merge branch 'joeyconfig'Joey Hess
2015-12-19prep releaseJoey Hess
(cherry picked from commit 6f0fe3614f3c55c4a9e312aa6fa6730316fe5ec7)
2015-12-19add news item for propellor 2.15.1Joey Hess
2015-12-19Merge branch 'joeyconfig'Joey Hess
2015-12-19Clean build with ghc 7.10.Joey Hess
Import Prelude after modules that cause warnings due to AMP change
2015-12-19prep releaseJoey Hess
2015-12-19Merge branch 'joeyconfig'Joey Hess
2015-12-17minor tweakJoey Hess
2015-12-17changelogJoey Hess
2015-12-17Gpg: fix gpg parameters in hasPrivKey and hasPubKeyFélix Sipma
(cherry picked from commit 04464ae17a7396d0cafffefc2880e68f40fc42ad)
2015-12-17hlintFélix Sipma
(cherry picked from commit e2d86f812bd37de9cda7d4ecc0e5b84821f359c1)
2015-12-17Gpg: use processTranscript in hasPrivKey and hasPubKeyFélix Sipma
(cherry picked from commit 21ffe59d0368f5cfe45316b31d661077e372d512)
2015-12-16Gpg: parse GpgKeyType in keyImportedFélix Sipma
(cherry picked from commit cdd1e093118b5eeab7743be7e2ec959980716145)
2015-12-16Gpg.keyImported: check if a pubKey is imported instead of using a flagfileFélix Sipma
(cherry picked from commit 9712d125a2c3e3c609b68d9958207c251ba005ac)
2015-12-16Gpg: use isJustFélix Sipma
(cherry picked from commit 1bb2377598e447e81e20a0e1de1a5d466851d655)
2015-12-16Gpg: add hasPrivKey and hasPubKeyFélix Sipma
(cherry picked from commit 7196b884e35ba907891c00d6e2840a36dce2214c)
2015-12-15Merge branch 'joeyconfig'Joey Hess
2015-12-15Merged Utility changes from git-annex.Joey Hess
2015-12-15merge from git-annexJoey Hess
withTmpDir security fix in git-annex merged Fix potential denial of service attack when creating temp dirs. withTmpDir now makes directory mode 700. AFAICS, propellor didn't leak any info with the old permissions, and no uses of withTmpDir in propellor are broken by the new permissions.
2015-12-14Merge branch 'joeyconfig'Joey Hess
2015-12-14changelogJoey Hess
2015-12-14User: systemAccountFor and systemAccountFor'Félix Sipma
(cherry picked from commit f56f9696a998d32d6d5c4eca29b28ee60def2db0)
2015-12-14User: add systemAccountFor and simpleSystemAccount propertiesFélix Sipma
(cherry picked from commit 4075a38db0fad4ef6e0c99e13c40ad9e0d54ec8b)
2015-12-13commentJoey Hess
2015-12-13Added a commentgueux
2015-12-13Added a commentgueux
2015-12-11commentJoey Hess
2015-12-11Merge branch 'joeyconfig'Joey Hess
2015-12-11commentJoey Hess
2015-12-11(no commit message)gueux
2015-12-11(no commit message)gueux
2015-12-11(no commit message)gueux
2015-12-08avoid crash when stdout is not open in call to hIsTerminalDeviceJoey Hess
Saw this happen in http://propellor.branchable.com/forum/Fail_to_push_changes_when_merging/ although I don't entirely understand the circumstances.
2015-12-08closeJoey Hess
2015-12-08Merge branch 'joeyconfig'Joey Hess
2015-12-08changelogJoey Hess