diff options
| author | jbj <devnull@localhost> | 2004-07-05 15:24:17 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2004-07-05 15:24:17 +0000 |
| commit | 07444608bcf20037636a4811a47b87d66c05d942 (patch) | |
| tree | 481c7a6feb82493d00bd8f04abb2f86e35770990 /lib/poptI.c | |
| parent | bc600c50e38ad8b3ab4385c2c5bbb8073024fbd7 (diff) | |
| download | rpm-07444608bcf20037636a4811a47b87d66c05d942.tar.gz rpm-07444608bcf20037636a4811a47b87d66c05d942.tar.bz2 rpm-07444608bcf20037636a4811a47b87d66c05d942.zip | |
- bump rpm and popt versions to insure "newer".
- change default behavior to resolve file conflicts as LIFO.
- add --fileconflicts to recover rpm traditional behavior.
- prefer elf64 over elf32 files, everywhere and always (#126853).
CVS patchset: 7354
CVS date: 2004/07/05 15:24:17
Diffstat (limited to 'lib/poptI.c')
| -rw-r--r-- | lib/poptI.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/poptI.c b/lib/poptI.c index 0346372d1..73f687057 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -14,7 +14,21 @@ extern time_t get_date(const char * p, void * now); /* XXX expedient lies */ /*@=redecl@*/ /*@unchecked@*/ -struct rpmInstallArguments_s rpmIArgs; +struct rpmInstallArguments_s rpmIArgs = { + 0, /* transFlags */ + /* probFilter */ + (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), + 0, /* installInterfaceFlags */ + 0, /* eraseInterfaceFlags */ + 0, /* qva_flags */ + 0, /* rbtid */ + 0, /* numRelocations */ + 0, /* noDeps */ + 0, /* incldocs */ + NULL, /* relocations */ + NULL, /* prefix */ + NULL /* rootdir */ +}; #define POPT_RELOCATE -1021 #define POPT_EXCLUDEPATH -1022 @@ -191,6 +205,9 @@ struct poptOption rpmInstallPoptTable[] = { N_("skip files with leading component <path> "), N_("<path>") }, + { "fileconflicts", '\0', POPT_BIT_CLR, &rpmIArgs.probFilter, + (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), + N_("detect file conflicts between packages"), NULL}, { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE, N_("short hand for --replacepkgs --replacefiles"), NULL}, @@ -297,7 +314,7 @@ struct poptOption rpmInstallPoptTable[] = { N_("save erased package files by repackaging"), NULL}, { "replacefiles", '\0', POPT_BIT_SET, &rpmIArgs.probFilter, (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), - N_("install even if the package replaces installed files"), NULL}, + N_("ignore file conflicts between packages"), NULL}, { "replacepkgs", '\0', POPT_BIT_SET, &rpmIArgs.probFilter, RPMPROB_FILTER_REPLACEPKG, N_("reinstall if the package is already present"), NULL}, |