diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /apt-private/private-main.cc | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'apt-private/private-main.cc')
| -rw-r--r-- | apt-private/private-main.cc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc index 1fdf3f0be..668b1733a 100644 --- a/apt-private/private-main.cc +++ b/apt-private/private-main.cc @@ -1,12 +1,25 @@ +#include <config.h> -#include<unistd.h> -#include<cstring> - +#include <apt-pkg/cmndline.h> #include <apt-pkg/configuration.h> -#include "private-main.h" + +#include <apt-private/private-main.h> + +#include <iostream> +#include <string.h> +#include <unistd.h> +#include <signal.h> #include <apti18n.h> + +void InitSignals() +{ + // Setup the signals + signal(SIGPIPE,SIG_IGN); +} + + void CheckSimulateMode(CommandLine &CmdL) { // simulate user-friendly if apt-get has no root privileges |