Skip to content

Commit c42ba50

Browse files
committed
Ad AD_MAINTAINER env variable and make legacy MAINTAINER env variable working.
1 parent bbf40a2 commit c42ba50

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

README.hooks

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ apt-dater configuration:
5757
AD_HOOK_PRE_REFRESH
5858
AD_HOOK_PRE_UPDATE
5959
AD_HOSTSFILE
60+
AD_MAINTAINER
6061
AD_SCREENRCFILE
6162
AD_SFTP_CMD
6263
AD_SSH_CMD

src/env.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*/
2424

2525
#include "env.h"
26+
#include "ui.h"
2627

2728
GSList *base_env = NULL;
2829

@@ -68,7 +69,7 @@ env_init(gchar **envp) {
6869

6970
gchar **
7071
env_build(HostNode *n, const gchar *action, const gchar *param, const HistoryEntry *he) {
71-
gchar **new_env = (gchar **) g_new0(gchar**, g_slist_length(base_env) + 22
72+
gchar **new_env = (gchar **) g_new0(gchar**, g_slist_length(base_env) + 24
7273
#ifdef FEAT_CLUSTERS
7374
+ g_list_length(n->clusters)
7475
#endif
@@ -150,5 +151,9 @@ env_build(HostNode *n, const gchar *action, const gchar *param, const HistoryEnt
150151
else
151152
ADD_HENV("PARAM" , "");
152153

154+
ADD_HENV("MAINTAINER", maintainer);
155+
/* add legacy MAINTAINER env variable */
156+
new_env[i++] = g_strdup_printf("MAINTAINER=%s", maintainer);
157+
153158
return new_env;
154159
}

src/ui.c

-4
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,6 @@ void doUI (GList *hosts)
18581858
strncpy(maintainer, pw->pw_name, sizeof(maintainer));
18591859
else
18601860
maintainer[0] = 0;
1861-
1862-
setenv("MAINTAINER", maintainer, TRUE);
18631861
}
18641862

18651863
if ((cfg->query_maintainer == 1) ||
@@ -1886,8 +1884,6 @@ void doUI (GList *hosts)
18861884

18871885
delwin(w);
18881886
refreshDraw();
1889-
1890-
setenv("MAINTAINER", maintainer, TRUE);
18911887
}
18921888
}
18931889

0 commit comments

Comments
 (0)