From 82a411be9b63df5bf8efda668561c77e50e3cb40 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 1 Jan 2018 13:40:13 -0400 Subject: update --- config.hs | 2 +- privdata/relocate | 1 - src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 privdata/relocate diff --git a/config.hs b/config.hs index 97d90636..ec313725 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -joeyconfig.hs \ No newline at end of file +config-simple.hs \ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate deleted file mode 100644 index 271692d8..00000000 --- a/privdata/relocate +++ /dev/null @@ -1 +0,0 @@ -.joeyconfig diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 9385493c..43ac822d 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1040,14 +1040,14 @@ laptopSoftware = Apt.installed [ "procmeter3", "xfce4", "procmeter3", "unclutter" , "mplayer", "fbreader", "firefox", "chromium" , "libdatetime-event-sunrise-perl", "libtime-duration-perl" - , "iftop", "network-manager", "gtk-redshift", "powertop" + , "network-manager", "gtk-redshift", "powertop" , "gimp", "gthumb", "inkscape", "sozi", "xzgv", "hugin" , "mpc", "mpd", "ncmpc", "sonata", "mpdtoys" , "bsdgames", "nethack" , "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev" , "ttf-bitstream-vera" , "mairix", "offlineimap", "mutt" - , "nmap" + , "nmap", "whois", "wireshark", "tcpdump", "iftop" , "udevil", "pmount" , "arbtt", "hledger", "bc" , "apache2", "ikiwiki", "libhighlight-perl" -- cgit v1.2.3 From df67ff0ad827c6d2db63e79f342106022716bd90 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 2 Jan 2018 12:34:58 -0400 Subject: avoid mixing concurrent and non-concurrent output for related messages If the concurrent output was delayed for whatever reason, the messages could appear out of order and separated from one-another. --- src/Propellor/DotDir.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs index f42c0575..e9253b87 100644 --- a/src/Propellor/DotDir.hs +++ b/src/Propellor/DotDir.hs @@ -427,7 +427,7 @@ setupUpstreamMaster newref = do warnoutofdate :: Bool -> IO () warnoutofdate havebranch = do warningMessage ("** Your ~/.propellor/ is out of date..") - let also s = hPutStrLn stderr (" " ++ s) + let also s = infoMessage [" " ++ s] also ("A newer upstream version is available in " ++ distrepo) if havebranch then also ("To merge it, run: git merge " ++ upstreambranch) -- cgit v1.2.3