| 1 |
commit: 0d9cd144937a2a4388cb299fbcd753257b085970 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 2 11:17:47 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 2 12:32:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0d9cd144 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
.travis.yml | 1 - |
| 13 |
NEWS | 11 + |
| 14 |
README | 2 +- |
| 15 |
RELEASE-NOTES | 43 ++ |
| 16 |
bin/binhost-snapshot | 5 +- |
| 17 |
bin/check-implicit-pointer-usage.py | 25 +- |
| 18 |
bin/chmod-lite.py | 11 +- |
| 19 |
bin/chpathtool.py | 10 +- |
| 20 |
bin/dispatch-conf | 2 +- |
| 21 |
bin/dohtml.py | 13 +- |
| 22 |
bin/doins.py | 31 +- |
| 23 |
bin/ebuild | 15 +- |
| 24 |
bin/ebuild-ipc.py | 2 +- |
| 25 |
bin/ecompress | 36 +- |
| 26 |
bin/egencache | 17 +- |
| 27 |
bin/filter-bash-environment.py | 11 +- |
| 28 |
bin/glsa-check | 2 +- |
| 29 |
bin/install.py | 19 +- |
| 30 |
bin/pid-ns-init | 10 +- |
| 31 |
bin/portageq | 4 +- |
| 32 |
bin/quickpkg | 2 +- |
| 33 |
bin/socks5-server.py | 2 +- |
| 34 |
bin/xattr-helper.py | 32 +- |
| 35 |
lib/_emerge/AbstractEbuildProcess.py | 3 +- |
| 36 |
lib/_emerge/AbstractPollTask.py | 1 - |
| 37 |
lib/_emerge/AsynchronousLock.py | 12 +- |
| 38 |
lib/_emerge/BinpkgFetcher.py | 14 +- |
| 39 |
lib/_emerge/BinpkgPrefetcher.py | 1 - |
| 40 |
lib/_emerge/BlockerCache.py | 29 +- |
| 41 |
lib/_emerge/BlockerDB.py | 7 +- |
| 42 |
lib/_emerge/DepPriority.py | 1 - |
| 43 |
lib/_emerge/DepPriorityNormalRange.py | 2 +- |
| 44 |
lib/_emerge/DepPrioritySatisfiedRange.py | 2 +- |
| 45 |
lib/_emerge/Dependency.py | 1 - |
| 46 |
lib/_emerge/DependencyArg.py | 17 +- |
| 47 |
lib/_emerge/EbuildBuild.py | 26 +- |
| 48 |
lib/_emerge/EbuildBuildDir.py | 1 - |
| 49 |
lib/_emerge/EbuildExecuter.py | 1 - |
| 50 |
lib/_emerge/EbuildFetcher.py | 15 +- |
| 51 |
lib/_emerge/EbuildMetadataPhase.py | 12 +- |
| 52 |
lib/_emerge/EbuildPhase.py | 53 ++- |
| 53 |
lib/_emerge/FakeVartree.py | 16 +- |
| 54 |
lib/_emerge/FifoIpcDaemon.py | 31 +- |
| 55 |
lib/_emerge/JobStatusDisplay.py | 15 +- |
| 56 |
lib/_emerge/MergeListItem.py | 2 +- |
| 57 |
lib/_emerge/Package.py | 46 +- |
| 58 |
lib/_emerge/PackageVirtualDbapi.py | 7 +- |
| 59 |
lib/_emerge/PipeReader.py | 14 +- |
| 60 |
lib/_emerge/PollScheduler.py | 2 +- |
| 61 |
lib/_emerge/ProgressHandler.py | 3 +- |
| 62 |
lib/_emerge/RootConfig.py | 2 +- |
| 63 |
lib/_emerge/Scheduler.py | 9 +- |
| 64 |
lib/_emerge/SequentialTaskQueue.py | 4 - |
| 65 |
lib/_emerge/SetArg.py | 1 - |
| 66 |
lib/_emerge/SpawnProcess.py | 85 ++-- |
| 67 |
lib/_emerge/SubProcess.py | 9 +- |
| 68 |
lib/_emerge/TaskSequence.py | 6 +- |
| 69 |
lib/_emerge/UnmergeDepPriority.py | 1 - |
| 70 |
lib/_emerge/UseFlagDisplay.py | 15 +- |
| 71 |
lib/_emerge/UserQuery.py | 23 +- |
| 72 |
lib/_emerge/_find_deep_system_runtime_deps.py | 1 - |
| 73 |
lib/_emerge/actions.py | 44 +- |
| 74 |
lib/_emerge/create_depgraph_params.py | 1 - |
| 75 |
lib/_emerge/create_world_atom.py | 10 +- |
| 76 |
lib/_emerge/depgraph.py | 167 ++++---- |
| 77 |
lib/_emerge/emergelog.py | 3 - |
| 78 |
lib/_emerge/help.py | 2 +- |
| 79 |
lib/_emerge/main.py | 14 +- |
| 80 |
lib/_emerge/resolver/DbapiProvidesIndex.py | 8 +- |
| 81 |
lib/_emerge/resolver/backtracking.py | 9 +- |
| 82 |
lib/_emerge/resolver/circular_dependency.py | 4 +- |
| 83 |
lib/_emerge/resolver/output.py | 65 ++- |
| 84 |
lib/_emerge/resolver/output_helpers.py | 35 +- |
| 85 |
lib/_emerge/resolver/package_tracker.py | 4 +- |
| 86 |
lib/_emerge/resolver/slot_collision.py | 85 ++-- |
| 87 |
lib/_emerge/search.py | 9 +- |
| 88 |
lib/_emerge/show_invalid_depstring_notice.py | 1 - |
| 89 |
lib/_emerge/stdout_spinner.py | 2 +- |
| 90 |
lib/_emerge/unmerge.py | 5 +- |
| 91 |
lib/portage/__init__.py | 67 ++- |
| 92 |
lib/portage/_emirrordist/Config.py | 11 +- |
| 93 |
lib/portage/_emirrordist/DeletionIterator.py | 2 +- |
| 94 |
lib/portage/_emirrordist/FetchIterator.py | 2 +- |
| 95 |
lib/portage/_emirrordist/FetchTask.py | 51 +-- |
| 96 |
lib/portage/_emirrordist/MirrorDistTask.py | 8 +- |
| 97 |
lib/portage/_emirrordist/main.py | 9 +- |
| 98 |
lib/portage/_global_updates.py | 3 +- |
| 99 |
lib/portage/_legacy_globals.py | 2 +- |
| 100 |
lib/portage/_selinux.py | 15 +- |
| 101 |
lib/portage/_sets/__init__.py | 9 +- |
| 102 |
lib/portage/_sets/base.py | 16 +- |
| 103 |
lib/portage/_sets/dbapi.py | 51 ++- |
| 104 |
lib/portage/cache/__init__.py | 1 - |
| 105 |
lib/portage/cache/anydbm.py | 36 +- |
| 106 |
lib/portage/cache/ebuild_xattr.py | 35 +- |
| 107 |
lib/portage/cache/flat_hash.py | 8 +- |
| 108 |
lib/portage/cache/fs_template.py | 13 +- |
| 109 |
lib/portage/cache/index/IndexStreamIterator.py | 2 +- |
| 110 |
lib/portage/cache/index/pkg_desc_index.py | 13 +- |
| 111 |
lib/portage/cache/mappings.py | 54 +-- |
| 112 |
lib/portage/cache/metadata.py | 9 +- |
| 113 |
lib/portage/cache/sql_template.py | 6 +- |
| 114 |
lib/portage/cache/sqlite.py | 15 +- |
| 115 |
lib/portage/cache/template.py | 34 +- |
| 116 |
lib/portage/checksum.py | 11 +- |
| 117 |
lib/portage/const.py | 2 - |
| 118 |
lib/portage/cvstree.py | 19 +- |
| 119 |
lib/portage/data.py | 10 +- |
| 120 |
lib/portage/dbapi/DummyTree.py | 2 +- |
| 121 |
lib/portage/dbapi/IndexedPortdb.py | 7 +- |
| 122 |
lib/portage/dbapi/IndexedVardb.py | 5 +- |
| 123 |
.../dbapi/_ContentsCaseSensitivityManager.py | 2 +- |
| 124 |
lib/portage/dbapi/_MergeProcess.py | 128 ++---- |
| 125 |
lib/portage/dbapi/_VdbMetadataDelta.py | 2 +- |
| 126 |
lib/portage/dbapi/__init__.py | 4 +- |
| 127 |
lib/portage/dbapi/_expand_new_virt.py | 2 - |
| 128 |
lib/portage/dbapi/bintree.py | 81 ++-- |
| 129 |
lib/portage/dbapi/cpv_expand.py | 8 +- |
| 130 |
lib/portage/dbapi/dep_expand.py | 2 - |
| 131 |
lib/portage/dbapi/porttree.py | 42 +- |
| 132 |
lib/portage/dbapi/vartree.py | 88 ++-- |
| 133 |
lib/portage/dbapi/virtual.py | 7 +- |
| 134 |
lib/portage/debug.py | 16 +- |
| 135 |
lib/portage/dep/__init__.py | 211 +++++----- |
| 136 |
lib/portage/dep/_dnf.py | 4 +- |
| 137 |
lib/portage/dep/_slot_operator.py | 2 - |
| 138 |
lib/portage/dep/dep_check.py | 15 +- |
| 139 |
lib/portage/dep/soname/SonameAtom.py | 13 +- |
| 140 |
lib/portage/dep/soname/multilib_category.py | 2 - |
| 141 |
lib/portage/dep/soname/parse.py | 2 - |
| 142 |
lib/portage/dispatch_conf.py | 4 +- |
| 143 |
lib/portage/eclass_cache.py | 17 +- |
| 144 |
lib/portage/elog/__init__.py | 6 +- |
| 145 |
lib/portage/elog/messages.py | 5 +- |
| 146 |
lib/portage/elog/mod_echo.py | 5 +- |
| 147 |
lib/portage/elog/mod_mail_summary.py | 4 +- |
| 148 |
lib/portage/elog/mod_save_summary.py | 5 - |
| 149 |
lib/portage/elog/mod_syslog.py | 10 +- |
| 150 |
lib/portage/emaint/main.py | 4 +- |
| 151 |
lib/portage/emaint/modules/binhost/binhost.py | 12 +- |
| 152 |
lib/portage/emaint/modules/config/config.py | 2 +- |
| 153 |
lib/portage/emaint/modules/logs/logs.py | 2 +- |
| 154 |
lib/portage/emaint/modules/merges/merges.py | 8 +- |
| 155 |
lib/portage/emaint/modules/move/move.py | 2 +- |
| 156 |
lib/portage/emaint/modules/resume/resume.py | 2 +- |
| 157 |
lib/portage/emaint/modules/sync/sync.py | 13 +- |
| 158 |
lib/portage/emaint/modules/world/world.py | 3 +- |
| 159 |
lib/portage/env/__init__.py | 1 - |
| 160 |
lib/portage/env/loaders.py | 2 +- |
| 161 |
lib/portage/exception.py | 53 +-- |
| 162 |
lib/portage/getbinpkg.py | 55 +-- |
| 163 |
lib/portage/glsa.py | 16 +- |
| 164 |
lib/portage/locks.py | 46 +- |
| 165 |
lib/portage/mail.py | 57 +-- |
| 166 |
lib/portage/manifest.py | 37 +- |
| 167 |
lib/portage/metadata.py | 2 +- |
| 168 |
lib/portage/module.py | 4 +- |
| 169 |
lib/portage/news.py | 8 +- |
| 170 |
lib/portage/output.py | 49 +-- |
| 171 |
.../package/ebuild/_config/KeywordsManager.py | 2 +- |
| 172 |
.../package/ebuild/_config/LicenseManager.py | 2 +- |
| 173 |
.../package/ebuild/_config/LocationsManager.py | 4 +- |
| 174 |
lib/portage/package/ebuild/_config/MaskManager.py | 2 +- |
| 175 |
lib/portage/package/ebuild/_config/UseManager.py | 2 +- |
| 176 |
.../package/ebuild/_config/VirtualsManager.py | 2 +- |
| 177 |
lib/portage/package/ebuild/_config/features_set.py | 2 +- |
| 178 |
.../package/ebuild/_config/special_env_vars.py | 10 +- |
| 179 |
lib/portage/package/ebuild/_ipc/IpcCommand.py | 2 +- |
| 180 |
lib/portage/package/ebuild/_ipc/QueryCommand.py | 17 +- |
| 181 |
.../ebuild/_parallel_manifest/ManifestProcess.py | 3 +- |
| 182 |
.../ebuild/_parallel_manifest/ManifestScheduler.py | 2 - |
| 183 |
lib/portage/package/ebuild/config.py | 51 +-- |
| 184 |
lib/portage/package/ebuild/doebuild.py | 20 +- |
| 185 |
lib/portage/package/ebuild/fetch.py | 28 +- |
| 186 |
lib/portage/package/ebuild/getmaskingreason.py | 9 +- |
| 187 |
lib/portage/package/ebuild/getmaskingstatus.py | 16 +- |
| 188 |
lib/portage/package/ebuild/prepare_build_dirs.py | 2 - |
| 189 |
lib/portage/process.py | 29 +- |
| 190 |
lib/portage/progress.py | 3 +- |
| 191 |
lib/portage/proxy/lazyimport.py | 7 +- |
| 192 |
lib/portage/proxy/objectproxy.py | 11 +- |
| 193 |
lib/portage/repository/config.py | 43 +- |
| 194 |
lib/portage/repository/storage/hardlink_rcu.py | 13 +- |
| 195 |
lib/portage/repository/storage/interface.py | 2 +- |
| 196 |
lib/portage/sync/config_checks.py | 2 +- |
| 197 |
lib/portage/sync/controller.py | 12 +- |
| 198 |
lib/portage/sync/getaddrinfo_validate.py | 7 +- |
| 199 |
lib/portage/sync/modules/git/__init__.py | 13 +- |
| 200 |
lib/portage/sync/modules/git/git.py | 37 +- |
| 201 |
lib/portage/sync/modules/rsync/rsync.py | 14 +- |
| 202 |
lib/portage/sync/modules/webrsync/webrsync.py | 1 - |
| 203 |
lib/portage/sync/syncbase.py | 12 +- |
| 204 |
lib/portage/tests/bin/setup_env.py | 20 +- |
| 205 |
lib/portage/tests/dbapi/test_auxdb.py | 2 - |
| 206 |
lib/portage/tests/dep/testAtom.py | 2 +- |
| 207 |
lib/portage/tests/dep/test_isvalidatom.py | 2 +- |
| 208 |
lib/portage/tests/dep/test_match_from_list.py | 14 +- |
| 209 |
lib/portage/tests/dep/test_soname_atom_pickle.py | 3 - |
| 210 |
lib/portage/tests/dep/test_use_reduce.py | 2 +- |
| 211 |
lib/portage/tests/ebuild/test_config.py | 2 - |
| 212 |
lib/portage/tests/ebuild/test_fetch.py | 6 +- |
| 213 |
lib/portage/tests/ebuild/test_spawn.py | 1 - |
| 214 |
.../tests/ebuild/test_use_expand_incremental.py | 2 - |
| 215 |
lib/portage/tests/emerge/test_config_protect.py | 2 - |
| 216 |
lib/portage/tests/env/__init__.py | 1 - |
| 217 |
lib/portage/tests/env/config/__init__.py | 1 - |
| 218 |
lib/portage/tests/glsa/test_security_set.py | 2 - |
| 219 |
lib/portage/tests/lint/test_bash_syntax.py | 1 - |
| 220 |
lib/portage/tests/process/test_AsyncFunction.py | 38 ++ |
| 221 |
lib/portage/tests/process/test_PipeLogger.py | 58 +++ |
| 222 |
lib/portage/tests/process/test_poll.py | 10 +- |
| 223 |
lib/portage/tests/resolver/ResolverPlayground.py | 19 +- |
| 224 |
.../resolver/test_binary_pkg_ebuild_visibility.py | 1 - |
| 225 |
.../tests/resolver/test_profile_default_eapi.py | 2 - |
| 226 |
.../tests/resolver/test_profile_package_set.py | 2 - |
| 227 |
lib/portage/tests/sets/files/testConfigFileSet.py | 1 - |
| 228 |
lib/portage/tests/sets/files/testStaticFileSet.py | 1 - |
| 229 |
lib/portage/tests/sets/shell/testShell.py | 8 +- |
| 230 |
lib/portage/tests/sync/test_sync_local.py | 11 +- |
| 231 |
lib/portage/tests/unicode/test_string_format.py | 54 +-- |
| 232 |
lib/portage/tests/util/__init__.py | 1 - |
| 233 |
.../tests/util/futures/asyncio/test_pipe_closed.py | 10 +- |
| 234 |
.../asyncio/test_policy_wrapper_recursion.py | 8 +- |
| 235 |
.../util/futures/asyncio/test_subprocess_exec.py | 5 - |
| 236 |
.../tests/util/futures/test_compat_coroutine.py | 2 +- |
| 237 |
lib/portage/tests/util/futures/test_retry.py | 34 +- |
| 238 |
lib/portage/tests/util/test_socks5.py | 31 +- |
| 239 |
lib/portage/tests/util/test_xattr.py | 14 +- |
| 240 |
lib/portage/update.py | 18 +- |
| 241 |
lib/portage/util/SlotObject.py | 2 +- |
| 242 |
lib/portage/util/_ShelveUnicodeWrapper.py | 45 -- |
| 243 |
lib/portage/util/__init__.py | 109 ++--- |
| 244 |
lib/portage/util/_async/AsyncFunction.py | 4 +- |
| 245 |
lib/portage/util/_async/BuildLogger.py | 109 +++++ |
| 246 |
lib/portage/util/_async/ForkProcess.py | 146 +++++-- |
| 247 |
lib/portage/util/_async/PipeLogger.py | 160 ++++--- |
| 248 |
lib/portage/util/_async/SchedulerInterface.py | 32 +- |
| 249 |
lib/portage/util/_compare_files.py | 23 +- |
| 250 |
lib/portage/util/_desktop_entry.py | 8 +- |
| 251 |
lib/portage/util/_dyn_libs/LinkageMapELF.py | 48 +-- |
| 252 |
lib/portage/util/_dyn_libs/NeededEntry.py | 15 +- |
| 253 |
.../util/_dyn_libs/PreservedLibsRegistry.py | 21 +- |
| 254 |
lib/portage/util/_dyn_libs/soname_deps.py | 4 +- |
| 255 |
lib/portage/util/_eventloop/EventLoop.py | 50 +-- |
| 256 |
lib/portage/util/_eventloop/PollConstants.py | 3 +- |
| 257 |
lib/portage/util/_eventloop/PollSelectAdapter.py | 3 +- |
| 258 |
lib/portage/util/_eventloop/asyncio_event_loop.py | 9 +- |
| 259 |
lib/portage/util/_eventloop/global_event_loop.py | 16 +- |
| 260 |
lib/portage/util/_urlopen.py | 67 ++- |
| 261 |
lib/portage/util/_xattr.py | 2 +- |
| 262 |
lib/portage/util/backoff.py | 2 +- |
| 263 |
lib/portage/util/changelog.py | 29 +- |
| 264 |
lib/portage/util/compression_probe.py | 5 +- |
| 265 |
lib/portage/util/configparser.py | 23 +- |
| 266 |
lib/portage/util/digraph.py | 8 +- |
| 267 |
lib/portage/util/elf/header.py | 2 +- |
| 268 |
lib/portage/util/env_update.py | 8 +- |
| 269 |
lib/portage/util/formatter.py | 5 +- |
| 270 |
lib/portage/util/futures/_asyncio/__init__.py | 48 +-- |
| 271 |
lib/portage/util/futures/_asyncio/process.py | 15 +- |
| 272 |
lib/portage/util/futures/_asyncio/streams.py | 52 ++- |
| 273 |
lib/portage/util/futures/_asyncio/tasks.py | 9 +- |
| 274 |
lib/portage/util/futures/compat_coroutine.py | 3 +- |
| 275 |
lib/portage/util/futures/events.py | 37 +- |
| 276 |
lib/portage/util/futures/executor/fork.py | 2 +- |
| 277 |
lib/portage/util/futures/extendedfutures.py | 2 - |
| 278 |
lib/portage/util/futures/futures.py | 42 +- |
| 279 |
lib/portage/util/futures/retry.py | 2 +- |
| 280 |
lib/portage/util/futures/transports.py | 5 +- |
| 281 |
lib/portage/util/futures/unix_events.py | 34 +- |
| 282 |
lib/portage/util/install_mask.py | 13 +- |
| 283 |
lib/portage/util/iterators/MultiIterGroupBy.py | 4 +- |
| 284 |
lib/portage/util/lafilefixer.py | 11 +- |
| 285 |
lib/portage/util/listdir.py | 3 - |
| 286 |
lib/portage/util/locale.py | 2 +- |
| 287 |
lib/portage/util/monotonic.py | 34 -- |
| 288 |
lib/portage/util/movefile.py | 65 +-- |
| 289 |
lib/portage/util/mtimedb.py | 6 +- |
| 290 |
lib/portage/util/socks5.py | 2 +- |
| 291 |
lib/portage/util/whirlpool.py | 26 +- |
| 292 |
lib/portage/util/writeable_check.py | 2 - |
| 293 |
lib/portage/versions.py | 40 +- |
| 294 |
lib/portage/xml/metadata.py | 24 +- |
| 295 |
lib/portage/xpak.py | 5 +- |
| 296 |
man/ebuild.5 | 4 +- |
| 297 |
man/egencache.1 | 4 +- |
| 298 |
man/emerge.1 | 8 +- |
| 299 |
man/make.conf.5 | 7 +- |
| 300 |
man/portage.5 | 54 +-- |
| 301 |
pylintrc | 464 +++++++++++++++++++++ |
| 302 |
repoman/RELEASE-NOTES | 5 + |
| 303 |
repoman/lib/repoman/__init__.py | 7 +- |
| 304 |
repoman/lib/repoman/actions.py | 4 +- |
| 305 |
repoman/lib/repoman/copyrights.py | 2 +- |
| 306 |
repoman/lib/repoman/errors.py | 2 +- |
| 307 |
repoman/lib/repoman/gpg.py | 2 +- |
| 308 |
repoman/lib/repoman/main.py | 4 +- |
| 309 |
repoman/lib/repoman/metadata.py | 7 +- |
| 310 |
repoman/lib/repoman/modules/commit/manifest.py | 2 +- |
| 311 |
repoman/lib/repoman/modules/commit/repochecks.py | 2 +- |
| 312 |
repoman/lib/repoman/modules/linechecks/base.py | 2 +- |
| 313 |
repoman/lib/repoman/modules/linechecks/config.py | 4 +- |
| 314 |
.../lib/repoman/modules/linechecks/controller.py | 2 +- |
| 315 |
.../modules/linechecks/deprecated/inherit.py | 2 + |
| 316 |
repoman/lib/repoman/modules/scan/ebuild/ebuild.py | 2 +- |
| 317 |
.../modules/scan/metadata/ebuild_metadata.py | 5 +- |
| 318 |
.../lib/repoman/modules/scan/metadata/use_flags.py | 2 +- |
| 319 |
repoman/lib/repoman/modules/scan/module.py | 2 +- |
| 320 |
repoman/lib/repoman/modules/scan/scanbase.py | 2 +- |
| 321 |
repoman/lib/repoman/modules/vcs/None/status.py | 2 +- |
| 322 |
repoman/lib/repoman/modules/vcs/bzr/status.py | 2 +- |
| 323 |
repoman/lib/repoman/modules/vcs/changes.py | 2 +- |
| 324 |
repoman/lib/repoman/modules/vcs/cvs/status.py | 2 +- |
| 325 |
repoman/lib/repoman/modules/vcs/git/status.py | 2 +- |
| 326 |
repoman/lib/repoman/modules/vcs/hg/status.py | 2 +- |
| 327 |
repoman/lib/repoman/modules/vcs/settings.py | 4 +- |
| 328 |
repoman/lib/repoman/modules/vcs/svn/status.py | 2 +- |
| 329 |
repoman/lib/repoman/modules/vcs/vcs.py | 2 +- |
| 330 |
repoman/lib/repoman/profile.py | 4 +- |
| 331 |
repoman/lib/repoman/qa_data.py | 2 +- |
| 332 |
repoman/lib/repoman/qa_tracker.py | 2 +- |
| 333 |
repoman/lib/repoman/repos.py | 2 +- |
| 334 |
repoman/lib/repoman/scanner.py | 4 +- |
| 335 |
repoman/lib/repoman/utilities.py | 5 +- |
| 336 |
repoman/setup.py | 4 +- |
| 337 |
runtests | 3 +- |
| 338 |
setup.py | 4 +- |
| 339 |
tox.ini | 6 +- |
| 340 |
328 files changed, 2638 insertions(+), 3095 deletions(-) |
| 341 |
|
| 342 |
diff --cc lib/portage/const.py |
| 343 |
index 146808fea,9a7ea23bd..50412c058 |
| 344 |
--- a/lib/portage/const.py |
| 345 |
+++ b/lib/portage/const.py |
| 346 |
@@@ -2,13 -2,6 +2,11 @@@ |
| 347 |
# Copyright 1998-2019 Gentoo Authors |
| 348 |
# Distributed under the terms of the GNU General Public License v2 |
| 349 |
|
| 350 |
- from __future__ import unicode_literals |
| 351 |
- |
| 352 |
+# =========================================================================== |
| 353 |
+# autotool supplied constants. |
| 354 |
+# =========================================================================== |
| 355 |
+from portage.const_autotool import * |
| 356 |
+ |
| 357 |
import os |
| 358 |
|
| 359 |
# =========================================================================== |
| 360 |
diff --cc lib/portage/data.py |
| 361 |
index 20a8d1ba7,3887ad32e..d2d356f95 |
| 362 |
--- a/lib/portage/data.py |
| 363 |
+++ b/lib/portage/data.py |
| 364 |
@@@ -2,8 -2,10 +2,11 @@@ |
| 365 |
# Copyright 1998-2014 Gentoo Foundation |
| 366 |
# Distributed under the terms of the GNU General Public License v2 |
| 367 |
|
| 368 |
- import os, pwd, grp, platform, sys |
| 369 |
+ import grp |
| 370 |
+ import os |
| 371 |
+ import platform |
| 372 |
+ import pwd |
| 373 |
+from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME, EPREFIX |
| 374 |
|
| 375 |
import portage |
| 376 |
portage.proxy.lazyimport.lazyimport(globals(), |
| 377 |
diff --cc lib/portage/util/__init__.py |
| 378 |
index 6bff97fb7,84f1391f6..322b217be |
| 379 |
--- a/lib/portage/util/__init__.py |
| 380 |
+++ b/lib/portage/util/__init__.py |
| 381 |
@@@ -48,12 -43,7 +43,8 @@@ from portage.exception import InvalidAt |
| 382 |
from portage.localization import _ |
| 383 |
from portage.proxy.objectproxy import ObjectProxy |
| 384 |
from portage.cache.mappings import UserDict |
| 385 |
+from portage.const import EPREFIX |
| 386 |
|
| 387 |
- if sys.hexversion >= 0x3000000: |
| 388 |
- _unicode = str |
| 389 |
- else: |
| 390 |
- _unicode = unicode |
| 391 |
|
| 392 |
noiselimit = 0 |
Archives