You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
244 lines
9.3 KiB
244 lines
9.3 KiB
7 years ago
|
diff -up yum-3.4.3/docs/yum.conf.5.orig yum-3.4.3/docs/yum.conf.5
|
||
|
|
--- yum-3.4.3/docs/yum.conf.5.orig 2017-11-24 20:52:02.648462776 +0100
|
||
|
|
+++ yum-3.4.3/docs/yum.conf.5 2017-11-24 20:52:18.483380945 +0100
|
||
|
|
@@ -1016,6 +1016,15 @@ If set to False, 'yum update' will fail
|
||
|
|
names (package, group, rpm file). It will also fail if the provided name is a package
|
||
|
|
which is available, but not installed. Boolean (1, 0, True, False, yes, no). Defaults to True.
|
||
|
|
|
||
|
|
+.IP
|
||
|
|
+\fBshell_exit_status\fR
|
||
|
|
+Determines the exit status that should be returned by `yum shell' when it
|
||
|
|
+terminates after reading the `exit' command or EOF.
|
||
|
|
+Possible values are: 0, ?.
|
||
|
|
+If ? is set, the exit status is that of the last command executed before `exit'
|
||
|
|
+(bash-like behavior).
|
||
|
|
+Defaults to 0.
|
||
|
|
+
|
||
|
|
.SH "[repository] OPTIONS"
|
||
|
|
.LP
|
||
|
|
The repository section(s) take the following form:
|
||
|
|
diff -up yum-3.4.3/docs/yum-shell.8.orig yum-3.4.3/docs/yum-shell.8
|
||
|
|
--- yum-3.4.3/docs/yum-shell.8.orig 2011-06-28 22:27:22.000000000 +0200
|
||
|
|
+++ yum-3.4.3/docs/yum-shell.8 2017-11-24 20:52:18.483380945 +0100
|
||
|
|
@@ -31,6 +31,12 @@ information. There are a few additional
|
||
|
|
reset: reset (zero-out) the transaction
|
||
|
|
solve: run the dependency solver on the transaction
|
||
|
|
run: run the transaction
|
||
|
|
+.IP
|
||
|
|
+.IP "\fBexit\fP"
|
||
|
|
+ Causes the shell to exit, setting the exit status as specified by the
|
||
|
|
+ \fBshell_exit_status\fR option in \fIyum.conf(5)\fR.
|
||
|
|
+ This command is also triggered when EOF is read (usually the C-d keystroke
|
||
|
|
+ or end of script).
|
||
|
|
|
||
|
|
.PP
|
||
|
|
.SH "Examples"
|
||
|
|
diff -up yum-3.4.3/shell.py.orig yum-3.4.3/shell.py
|
||
|
|
--- yum-3.4.3/shell.py.orig 2017-11-24 20:52:02.580463129 +0100
|
||
|
|
+++ yum-3.4.3/shell.py 2017-11-24 20:52:18.483380945 +0100
|
||
|
|
@@ -126,6 +126,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
|
||
|
|
:param line: the next line of input
|
||
|
|
"""
|
||
|
|
+ self.result = 0
|
||
|
|
if len(line) > 0 and line.strip()[0] == '#':
|
||
|
|
pass
|
||
|
|
else:
|
||
|
|
@@ -150,7 +151,8 @@ class YumShell(cmd.Cmd):
|
||
|
|
except Errors.YumBaseError:
|
||
|
|
pass
|
||
|
|
else:
|
||
|
|
- self.base.doCommands()
|
||
|
|
+ result, _ = self.base.doCommands()
|
||
|
|
+ self.result = result
|
||
|
|
|
||
|
|
def emptyline(self):
|
||
|
|
"""Do nothing on an empty line of input."""
|
||
|
|
@@ -211,13 +213,14 @@ class YumShell(cmd.Cmd):
|
||
|
|
self.base.shellUsage()
|
||
|
|
|
||
|
|
self.verbose_logger.info(msg)
|
||
|
|
+ self.result = 0
|
||
|
|
|
||
|
|
def do_EOF(self, line):
|
||
|
|
"""Exit the shell when EOF is reached.
|
||
|
|
|
||
|
|
:param line: unused
|
||
|
|
"""
|
||
|
|
- self.resultmsgs = ['Leaving Shell']
|
||
|
|
+ self.do_exit(line)
|
||
|
|
return True
|
||
|
|
|
||
|
|
def do_quit(self, line):
|
||
|
|
@@ -225,7 +228,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
|
||
|
|
:param line: unused
|
||
|
|
"""
|
||
|
|
- self.resultmsgs = ['Leaving Shell']
|
||
|
|
+ self.do_exit(line)
|
||
|
|
return True
|
||
|
|
|
||
|
|
def do_exit(self, line):
|
||
|
|
@@ -233,6 +236,9 @@ class YumShell(cmd.Cmd):
|
||
|
|
|
||
|
|
:param line: unused
|
||
|
|
"""
|
||
|
|
+ # Make sure we don't go onto the next stage in yummain (result == 2)
|
||
|
|
+ if self.base.conf.shell_exit_status == '0' or self.result == 2:
|
||
|
|
+ self.result = 0
|
||
|
|
self.resultmsgs = ['Leaving Shell']
|
||
|
|
return True
|
||
|
|
|
||
|
|
@@ -254,6 +260,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
:param line: the remainder of the line, containing the name of
|
||
|
|
a subcommand. If no subcommand is given, run the list subcommand.
|
||
|
|
"""
|
||
|
|
+ self.result = 0
|
||
|
|
(cmd, args, line) = self.parseline(line)
|
||
|
|
if cmd in ['list', None]:
|
||
|
|
self.verbose_logger.log(logginglevels.INFO_2,
|
||
|
|
@@ -267,11 +274,13 @@ class YumShell(cmd.Cmd):
|
||
|
|
(code, msgs) = self.base.buildTransaction()
|
||
|
|
except Errors.YumBaseError, e:
|
||
|
|
self.logger.critical('Error building transaction: %s', e)
|
||
|
|
+ self.result = 1
|
||
|
|
return False
|
||
|
|
|
||
|
|
if code == 1:
|
||
|
|
for msg in msgs:
|
||
|
|
self.logger.critical('Error: %s', msg)
|
||
|
|
+ self.result = 1
|
||
|
|
else:
|
||
|
|
self.verbose_logger.log(logginglevels.INFO_2,
|
||
|
|
'Success resolving dependencies')
|
||
|
|
@@ -292,6 +301,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
value is given, print the current value. If a value is
|
||
|
|
supplied, set the option to the given value.
|
||
|
|
"""
|
||
|
|
+ self.result = 0
|
||
|
|
(cmd, args, line) = self.parseline(line)
|
||
|
|
# logs
|
||
|
|
if cmd in ['debuglevel', 'errorlevel']:
|
||
|
|
@@ -305,6 +315,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
val = int(val)
|
||
|
|
except ValueError:
|
||
|
|
self.logger.critical('Value %s for %s cannot be made to an int', val, cmd)
|
||
|
|
+ self.result = 1
|
||
|
|
return
|
||
|
|
setattr(self.base.conf, cmd, val)
|
||
|
|
if cmd == 'debuglevel':
|
||
|
|
@@ -321,6 +332,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
value = opts[0]
|
||
|
|
if value.lower() not in BOOLEAN_STATES:
|
||
|
|
self.logger.critical('Value %s for %s is not a Boolean', value, cmd)
|
||
|
|
+ self.result = 1
|
||
|
|
return False
|
||
|
|
value = BOOLEAN_STATES[value.lower()]
|
||
|
|
setattr(self.base.conf, cmd, value)
|
||
|
|
@@ -363,6 +375,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
a subcommand and other parameters if required. If no
|
||
|
|
subcommand is given, run the list subcommand.
|
||
|
|
"""
|
||
|
|
+ self.result = 0
|
||
|
|
(cmd, args, line) = self.parseline(line)
|
||
|
|
if cmd in ['list', None]:
|
||
|
|
# Munge things to run the repolist command
|
||
|
|
@@ -380,7 +393,8 @@ class YumShell(cmd.Cmd):
|
||
|
|
except Errors.YumBaseError:
|
||
|
|
pass
|
||
|
|
else:
|
||
|
|
- self.base.doCommands()
|
||
|
|
+ result, _ = self.base.doCommands()
|
||
|
|
+ self.result = result
|
||
|
|
|
||
|
|
elif cmd == 'enable':
|
||
|
|
repos = self._shlex_split(args)
|
||
|
|
@@ -392,8 +406,10 @@ class YumShell(cmd.Cmd):
|
||
|
|
changed = self.base.repos.enableRepo(repo)
|
||
|
|
except Errors.ConfigError, e:
|
||
|
|
self.logger.critical(e)
|
||
|
|
+ self.result = 1
|
||
|
|
except Errors.RepoError, e:
|
||
|
|
self.logger.critical(e)
|
||
|
|
+ self.result = 1
|
||
|
|
|
||
|
|
else:
|
||
|
|
for repo in changed:
|
||
|
|
@@ -402,6 +418,7 @@ class YumShell(cmd.Cmd):
|
||
|
|
except Errors.RepoError, e:
|
||
|
|
self.logger.critical('Disabling Repository')
|
||
|
|
self.base.repos.disableRepo(repo)
|
||
|
|
+ self.result = 1
|
||
|
|
return False
|
||
|
|
|
||
|
|
self.base.up = None
|
||
|
|
@@ -413,8 +430,10 @@ class YumShell(cmd.Cmd):
|
||
|
|
offrepos = self.base.repos.disableRepo(repo)
|
||
|
|
except Errors.ConfigError, e:
|
||
|
|
self.logger.critical(e)
|
||
|
|
+ self.result = 1
|
||
|
|
except Errors.RepoError, e:
|
||
|
|
self.logger.critical(e)
|
||
|
|
+ self.result = 1
|
||
|
|
|
||
|
|
else:
|
||
|
|
# close the repos, too
|
||
|
|
@@ -432,36 +451,45 @@ class YumShell(cmd.Cmd):
|
||
|
|
print cmd
|
||
|
|
print args
|
||
|
|
print line
|
||
|
|
+ self.result = 0
|
||
|
|
|
||
|
|
def do_run(self, line):
|
||
|
|
"""Run the transaction.
|
||
|
|
|
||
|
|
:param line: unused
|
||
|
|
"""
|
||
|
|
+ self.result = 0
|
||
|
|
if len(self.base.tsInfo) > 0:
|
||
|
|
try:
|
||
|
|
(code, msgs) = self.base.buildTransaction()
|
||
|
|
if code == 1:
|
||
|
|
for msg in msgs:
|
||
|
|
self.logger.critical('Error: %s', msg)
|
||
|
|
+ self.result = 1
|
||
|
|
return False
|
||
|
|
|
||
|
|
returnval = self.base.doTransaction()
|
||
|
|
except Errors.YumBaseError, e:
|
||
|
|
self.logger.critical('Error: %s', e)
|
||
|
|
+ self.result = 1
|
||
|
|
except KeyboardInterrupt, e:
|
||
|
|
self.logger.critical('\n\nExiting on user cancel')
|
||
|
|
+ self.result = 1
|
||
|
|
except IOError, e:
|
||
|
|
if e.errno == 32:
|
||
|
|
self.logger.critical('\n\nExiting on Broken Pipe')
|
||
|
|
+ self.result = 1
|
||
|
|
else:
|
||
|
|
if returnval not in [0,1,-1]:
|
||
|
|
self.verbose_logger.info('Transaction encountered a serious error.')
|
||
|
|
+ self.result = 1
|
||
|
|
else:
|
||
|
|
if returnval == 1:
|
||
|
|
self.verbose_logger.info('There were non-fatal errors in the transaction')
|
||
|
|
+ self.result = 1
|
||
|
|
elif returnval == -1:
|
||
|
|
self.verbose_logger.info("Transaction didn't start")
|
||
|
|
+ self.result = 1
|
||
|
|
self.verbose_logger.log(logginglevels.INFO_2,
|
||
|
|
'Finished Transaction')
|
||
|
|
self.base.closeRpmDB()
|
||
|
|
diff -up yum-3.4.3/yum/config.py.orig yum-3.4.3/yum/config.py
|
||
|
|
--- yum-3.4.3/yum/config.py.orig 2017-11-24 20:52:02.648462776 +0100
|
||
|
|
+++ yum-3.4.3/yum/config.py 2017-11-24 20:52:18.484380940 +0100
|
||
|
|
@@ -931,6 +931,8 @@ class YumConf(StartupConf):
|
||
|
|
|
||
|
|
usr_w_check = BoolOption(True)
|
||
|
|
|
||
|
|
+ shell_exit_status = SelectionOption('0', ('0', '?'))
|
||
|
|
+
|
||
|
|
_reposlist = []
|
||
|
|
|
||
|
|
def dump(self):
|