diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 66f69bd..8f76670 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -205749,7 +205749,7 @@ index 4dcbea7..b610f3a 100644 + + return 0, [basecmd + ' ' + subcommand + ' done'] diff --git a/yummain.py b/yummain.py -index 9f79f4f..ee8d632 100755 +index 9f79f4f..24bbe6c 100755 --- a/yummain.py +++ b/yummain.py @@ -29,13 +29,13 @@ from yum import Errors @@ -205908,7 +205908,7 @@ index 9f79f4f..ee8d632 100755 elif result == 1: # Fatal error for msg in resultmsgs: -@@ -173,6 +209,17 @@ def main(args): +@@ -173,6 +209,18 @@ def main(args): logger.critical(msg) if unlock(): return 200 return 3 @@ -205917,7 +205917,8 @@ index 9f79f4f..ee8d632 100755 + if base.conf.usr_w_check: + usrinstpath = base.conf.installroot + "/usr" + usrinstpath = usrinstpath.replace('//', '/') -+ if not os.access(usrinstpath, os.W_OK): ++ if (os.path.exists(usrinstpath) and ++ not os.access(usrinstpath, os.W_OK)): + logger.critical(_('No write access to %s directory') % usrinstpath) + logger.critical(_(' Maybe this is an ostree image?')) + logger.critical(_(' To disable you can use --setopt=usr_w_check=false')) @@ -205926,7 +205927,7 @@ index 9f79f4f..ee8d632 100755 # Depsolve stage verbose_logger.log(logginglevels.INFO_2, _('Resolving Dependencies')) -@@ -181,6 +228,8 @@ def main(args): +@@ -181,6 +229,8 @@ def main(args): (result, resultmsgs) = base.buildTransaction() except plugins.PluginYumExit, e: return exPluginExit(e) @@ -205935,7 +205936,7 @@ index 9f79f4f..ee8d632 100755 except Errors.YumBaseError, e: result = 1 resultmsgs = [exception2msg(e)] -@@ -193,7 +242,7 @@ def main(args): +@@ -193,7 +243,7 @@ def main(args): if result == 0: # Normal exit if unlock(): return 200 @@ -205944,7 +205945,7 @@ index 9f79f4f..ee8d632 100755 elif result == 1: # Fatal error for msg in resultmsgs: -@@ -223,6 +272,8 @@ def main(args): +@@ -223,6 +273,8 @@ def main(args): return_code = base.doTransaction() except plugins.PluginYumExit, e: return exPluginExit(e) @@ -205953,7 +205954,7 @@ index 9f79f4f..ee8d632 100755 except Errors.YumBaseError, e: return exFatal(e) except KeyboardInterrupt: -@@ -238,16 +289,27 @@ def main(args): +@@ -238,16 +290,27 @@ def main(args): rpmdb_warn_checks() return_code = result if base._ts_save_file: @@ -205983,7 +205984,7 @@ index 9f79f4f..ee8d632 100755 import hotshot.stats fn = os.path.expanduser("~/yum.prof") prof = hotshot.Profile(fn) -@@ -257,6 +319,11 @@ def hotshot(func, *args, **kwargs): +@@ -257,6 +320,11 @@ def hotshot(func, *args, **kwargs): return rc def cprof(func, *args, **kwargs): @@ -205995,7 +205996,7 @@ index 9f79f4f..ee8d632 100755 import cProfile, pstats fn = os.path.expanduser("~/yum.prof") prof = cProfile.Profile() -@@ -266,6 +333,10 @@ def cprof(func, *args, **kwargs): +@@ -266,6 +334,10 @@ def cprof(func, *args, **kwargs): return rc def print_stats(stats): @@ -206006,7 +206007,7 @@ index 9f79f4f..ee8d632 100755 stats.strip_dirs() stats.sort_stats('time', 'calls') stats.print_stats(20) -@@ -273,7 +344,14 @@ def print_stats(stats): +@@ -273,7 +345,14 @@ def print_stats(stats): stats.print_stats(40) def user_main(args, exit_code=False): diff --git a/yum.spec b/yum.spec index d391000..515153d 100644 --- a/yum.spec +++ b/yum.spec @@ -64,7 +64,7 @@ BuildRequires: bash-completion Summary: RPM package installer/updater/manager Name: yum Version: 3.4.3 -Release: 147%{?dist} +Release: 148%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz @@ -507,7 +507,7 @@ exit 0 %endif %changelog -* Wed May 21 2014 James Antill - 3.4.3-147 +* Wed May 21 2014 James Antill - 3.4.3-148 - update to latest HEAD - Check /usr for writability before running a transaction. - Add repo= arguments to almost all RepoError raises, so we don't print unknown.