← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/dpkg/oneiric-proposed

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: Steve Langasek
  • Date: 2011-03-15 00:11:56 UTC
  • Revision ID: steve.langasek@linaro.org-20110315001156-uyrlgh501d69seku
https://launchpad.net/bugs/728708
Merge newer snapshot from Raphael, to keep us in tune with mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
191
191
int fc_badverify = 0;
192
192
 
193
193
int errabort = 50;
194
 
const char *admindir= ADMINDIR;
 
194
static const char *admindir = ADMINDIR;
195
195
const char *instdir= "";
196
196
struct pkg_list *ignoredependss = NULL;
197
197
 
761
761
 
762
762
  if (!cipaction) badusage(_("need an action option"));
763
763
 
 
764
  admindir = dpkg_db_set_dir(admindir);
 
765
 
764
766
  /* Always set environment, to avoid possible security risks. */
765
767
  if (setenv("DPKG_ADMINDIR", admindir, 1) < 0)
766
768
    ohshite(_("unable to setenv for subprocesses"));