diff options
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 6 | ||||
| -rwxr-xr-x | cmdline/apt-key | 8 | ||||
| -rwxr-xr-x | cmdline/apt-mark | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 6d580cc28..de22386b9 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data) { char fn[512]; static int i; - char *tempdir = NULL; + const char *tempdir = NULL; tempdir = getenv("TMPDIR"); if (tempdir == NULL) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c9ec481aa..e214691f8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1708,7 +1708,8 @@ bool DoInstall(CommandLine &CmdL) // where foo is marked automatic if(!Remove && Cache[Pkg].Install() == false && - (Cache[Pkg].Flags & pkgCache::Flag::Auto)) + (Cache[Pkg].Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false) { ioprintf(c1out,_("%s set to manual installed.\n"), Pkg.Name()); @@ -2471,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL) break; } if (CV.end() == true) + { if (hasAlternatives) { continue; @@ -2483,6 +2485,7 @@ bool DoBuildDep(CommandLine &CmdL) Last->BuildDepType((*D).Type),Src.c_str(), (*D).Package.c_str()); } + } } else { @@ -2752,6 +2755,7 @@ int main(int argc,const char *argv[]) {"install",&DoInstall}, {"remove",&DoInstall}, {"autoremove",&DoInstall}, + {"purge",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, diff --git a/cmdline/apt-key b/cmdline/apt-key index 90ecae2cf..3bd1a92d9 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -39,6 +39,8 @@ usage() { echo echo " apt-key add <file> - add the key contained in <file> ('-' for stdin)" echo " apt-key del <keyid> - remove the key <keyid>" + echo " apt-key export <keyid> - output the key <keyid>" + echo " apt-key exportall - output all trusted keys" echo " apt-key update - update keys using the keyring package" echo " apt-key list - list keys" echo @@ -75,6 +77,12 @@ case "$command" in finger*) $GPG --batch --fingerprint ;; + export) + $GPG --armor --export "$1" + ;; + exportall) + $GPG --armor --export + ;; adv*) echo "Executing: $GPG $*" $GPG $* diff --git a/cmdline/apt-mark b/cmdline/apt-mark index fdc3e1856..f6e749eb5 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -40,7 +40,7 @@ if __name__ == "__main__": if not options.filename: STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" else: - STATE_FILE=options.state_file + STATE_FILE=options.filename # open the statefile if os.path.exists(STATE_FILE): @@ -62,4 +62,4 @@ if __name__ == "__main__": # all done, rename the tmpfile os.chmod(outfile.name, 0644) os.rename(outfile.name, STATE_FILE) - os.chmod(outfile.name, 0644) + os.chmod(STATE_FILE, 0644) |