diff options
| author | Dan McGee <dan@archlinux.org> | 2007-06-28 05:25:04 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-06-28 05:34:38 +0200 |
| commit | 7daa6708d2afc710bebbb2dc30f4371f9d67120c (patch) | |
| tree | 2321ad0d697ce56b4cad0e16222b3888cd31ac2f /src | |
| parent | 7bdb904af5b664c1d6e47977f21f0e6bc3f8e3b0 (diff) | |
| download | pacman-7daa6708d2afc710bebbb2dc30f4371f9d67120c.tar.gz pacman-7daa6708d2afc710bebbb2dc30f4371f9d67120c.tar.xz | |
Remove lockfile configuration from frontend, make it job of libalpm
I previously introduced some patches to make just about every path in
pacman/libalpm configurable; doing this with the lockfile seemed a bit too
far and we really should just place the lockfile where it belongs- with the
DB that needs locking.
More details in this thread:
http://archlinux.org/pipermail/pacman-dev/2007-June/008499.html
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/Makefile.am | 1 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 1ab59166..39e65920 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = po # paths set at make time conffile = ${sysconfdir}/pacman.conf -lockfile = ${localstatedir}/run/pacman.lck bin_PROGRAMS = pacman pacman.static diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e0f9ba68..a345977d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -149,7 +149,6 @@ static void usage(int op, char *myname) printf(_(" -r, --root <path> set an alternate installation root\n")); printf(_(" -b, --dbpath <path> set an alternate database location\n")); printf(_(" --cachedir <dir> set an alternate package cache location\n")); - printf(_(" --lock <file> set an alternate lockfile location\n")); } } @@ -293,7 +292,6 @@ static int parseargs(int argc, char *argv[]) {"noscriptlet", no_argument, 0, 1005}, {"ask", required_argument, 0, 1006}, {"cachedir", required_argument, 0, 1007}, - {"lock", required_argument, 0, 1008}, {0, 0, 0, 0} }; struct stat st; @@ -347,9 +345,6 @@ static int parseargs(int argc, char *argv[]) } alpm_option_add_cachedir(optarg); break; - case 1008: - alpm_option_set_lockfile(optarg); - break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); @@ -636,11 +631,6 @@ static int _parseconfig(const char *file, const char *givensection, alpm_option_set_logfile(ptr); pm_printf(PM_LOG_DEBUG, _("config: logfile: %s\n"), ptr); } - } else if (strcmp(key, "LockFile") == 0 || strcmp(upperkey, "LOCKFILE") == 0) { - if(alpm_option_get_lockfile() == NULL) { - alpm_option_set_lockfile(ptr); - pm_printf(PM_LOG_DEBUG, _("config: lockfile: %s\n"), ptr); - } } else if (strcmp(key, "XferCommand") == 0 || strcmp(upperkey, "XFERCOMMAND") == 0) { alpm_option_set_xfercommand(ptr); pm_printf(PM_LOG_DEBUG, _("config: xfercommand: %s\n"), ptr); |