From 52275b373da70683e03b8fef301c52e502e974f0 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 30 Dec 2008 20:43:58 +0000 Subject: [PATCH] Rename apt-shell patches according to the policy --- ...> apt-0.5.15lorg2-alt-apt-shell-list_completion.patch | 7 ++----- ...ch => apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch | 9 +++------ apt.spec | 8 ++++---- 3 files changed, 9 insertions(+), 15 deletions(-) rename apt-0.5.15lorg2-alt-apt-shell_list_completion.patch => apt-0.5.15lorg2-alt-apt-shell-list_completion.patch (74%) rename apt-0.5.15lorg2-alt-apt-shell_quit_by_ctrld.patch => apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch (72%) diff --git a/apt-0.5.15lorg2-alt-apt-shell_list_completion.patch b/apt-0.5.15lorg2-alt-apt-shell-list_completion.patch similarity index 74% rename from apt-0.5.15lorg2-alt-apt-shell_list_completion.patch rename to apt-0.5.15lorg2-alt-apt-shell-list_completion.patch index 0f6ec3b..e05d8c8 100644 --- a/apt-0.5.15lorg2-alt-apt-shell_list_completion.patch +++ b/apt-0.5.15lorg2-alt-apt-shell-list_completion.patch @@ -1,10 +1,7 @@ - https://bugzilla.altlinux.org/show_bug.cgi?id=5953 -diff --git a/apt/cmdline/apt-shell.cc b/apt/cmdline/apt-shell.cc -index 6d1f767..76bd840 100644 ---- a/apt/cmdline/apt-shell.cc -+++ b/apt/cmdline/apt-shell.cc +--- apt/cmdline/apt-shell.cc ++++ apt/cmdline/apt-shell.cc @@ -4087,7 +4099,7 @@ char *ReadLineCompCommands(const char *Text, int State) "keep", "dist-upgrade", "dselect-upgrade", "build-dep", "clean", "autoclean", "check", "help", "commit", "exit", "quit", "status", diff --git a/apt-0.5.15lorg2-alt-apt-shell_quit_by_ctrld.patch b/apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch similarity index 72% rename from apt-0.5.15lorg2-alt-apt-shell_quit_by_ctrld.patch rename to apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch index 28d13d0..4cafbca 100644 --- a/apt-0.5.15lorg2-alt-apt-shell_quit_by_ctrld.patch +++ b/apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch @@ -1,10 +1,7 @@ - https://bugzilla.altlinux.org/show_bug.cgi?id=18343 -diff --git a/apt/cmdline/apt-shell.cc b/apt/cmdline/apt-shell.cc -index 6d1f767..3aadbd5 100644 ---- a/apt/cmdline/apt-shell.cc -+++ b/apt/cmdline/apt-shell.cc +--- apt/cmdline/apt-shell.cc ++++ apt/cmdline/apt-shell.cc @@ -4477,10 +4477,17 @@ int main(int argc,const char *argv[]) } @@ -13,7 +10,7 @@ index 6d1f767..3aadbd5 100644 - free(line); - continue; + if (!line) { -+ // exit from shell by Ctrl-D ++ // exit from shell by EOF + _config->Set("quit", "true"); + continue; + } diff --git a/apt.spec b/apt.spec index 40297a8..4d16cc6 100644 --- a/apt.spec +++ b/apt.spec @@ -68,8 +68,8 @@ Patch56: apt-0.5.15lorg2-lorg-pkgcachegen-selfprov.patch Patch57: apt-0.5.15lorg2-alt-genpkglist-no-fileflags.patch Patch58: apt-0.5.15lorg2-lorg-cache-limit.patch Patch59: apt-0.5.15lorg2-alt-gcc4.3.patch -Patch60: apt-0.5.15lorg2-alt-apt-shell_list_completion.patch -Patch61: apt-0.5.15lorg2-alt-apt-shell_quit_by_ctrld.patch +Patch60: apt-0.5.15lorg2-alt-apt-shell-list_completion.patch +Patch61: apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch # Normally not applied, but useful. Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch @@ -269,8 +269,8 @@ This package contains method 'rsync' for APT. %patch57 -p1 %patch58 -p1 %patch59 -p1 -%patch60 -p2 -%patch61 -p2 +%patch60 -p1 +%patch61 -p1 find -type f -name \*.orig -delete