fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-19 06:40:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: ignore .rpmnew files (rh #509621)

Browse source
This commit is contained in:
Dan Williams 2009-11-11 17:22:59 -08:00
parent 92db663514
commit 420ea0220c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
system-settings/plugins/ifcfg-rh/common.h
View file

@ -29,6 +29,7 @@
#define TILDE_TAG "~"
#define ORIG_TAG ".orig"
#define REJ_TAG ".rej"
#define RPMNEW_TAG ".rpmnew"
#define IFCFG_DIR SYSCONFDIR"/sysconfig/network-scripts"

3
system-settings/plugins/ifcfg-rh/plugin.c
View file

@ -183,7 +183,8 @@ should_ignore_file (const char *filename)
&& !check_suffix (base, BAK_TAG)
&& !check_suffix (base, TILDE_TAG)
&& !check_suffix (base, ORIG_TAG)
&& !check_suffix (base, REJ_TAG))
&& !check_suffix (base, REJ_TAG)
&& !check_suffix (base, RPMNEW_TAG))
ignore = FALSE;
g_free (base);