Rename apt-shell patches according to the policy
This commit is contained in:
parent
7956d444db
commit
52275b373d
@ -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",
|
@ -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;
|
||||
+ }
|
8
apt.spec
8
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user