From bf192dff3b5cea9001e23fe6f433ec9f9acddb86 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 21 Sep 2009 19:00:57 +0000 Subject: [PATCH] do print transformations that 2to3 doesn't seem to catch svn path=/main/branches/prefix/; revision=14359 --- pym/_emerge/actions.py | 12 ++++++------ pym/portage/dbapi/vartree.py | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 34fdda3d9..fcf0453c9 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2158,17 +2158,17 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): elif syncuri[:11]=="svn+http://" or syncuri[:6]=="svn://" or syncuri[:12]=="svn+https://": # Gentoo Prefix hardcoded SVN support if not os.path.exists(EPREFIX + "/usr/bin/svn"): - print "!!! " + EPREFIX + "/usr/bin/svn does not exist, so SVN support is disabled." - print "!!! Type \"emerge dev-util/subversion\" to enable SVN support." + print("!!! " + EPREFIX + "/usr/bin/svn does not exist, so SVN support is disabled.") + print("!!! Type \"emerge dev-util/subversion\" to enable SVN support.") sys.exit(1) svndir=os.path.dirname(myportdir) if not os.path.exists(myportdir+"/.svn"): #initial checkout if syncuri[:4] == "svn+": syncuri = syncuri[4:] - print ">>> Starting initial svn checkout with "+syncuri+"..." + print(">>> Starting initial svn checkout with "+syncuri+"...") if os.path.exists(svndir+"/prefix-overlay"): - print "!!! existing",svndir+"/prefix-overlay directory; exiting." + print("!!! existing",svndir+"/prefix-overlay directory; exiting.") sys.exit(1) try: os.rmdir(myportdir) @@ -2179,12 +2179,12 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): sys.exit(1) del e if portage.spawn("cd "+svndir+"; svn checkout "+syncuri,settings,free=1): - print "!!! svn checkout error; exiting." + print("!!! svn checkout error; exiting.") sys.exit(1) os.rename(os.path.join(svndir, "prefix-overlay"), myportdir) else: #svn update - print ">>> Starting svn update..." + print(">>> Starting svn update...") retval = portage.spawn("cd '%s'; svn update" % myportdir, \ settings, free=1) if retval != os.EX_OK: diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 9fb2ecafb..c9d75d4c4 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1088,13 +1088,13 @@ class LinkageMapMachO(object): # XXX This is most often due to soname symlinks not in # a library's directory. We could catalog symlinks in # LinkageMap to avoid checking for this edge case here. - print "Found provider outside of findProviders:", \ - install_name, "->", cachedRealpath + print(_("Found provider outside of findProviders:"), \ + install_name, "->", cachedRealpath) if debug and cachedArch == arch and \ cachedKey in self._obj_properties: - print "Broken symlink or missing/bad install_name:", \ + print(_("Broken symlink or missing/bad install_name:"), \ install_name, '->', cachedRealpath, \ - "with install_name", cachedInstallname, "but expecting", install_name + "with install_name", cachedInstallname, "but expecting", install_name) # This conditional checks if there are no libraries to # satisfy the install_name (empty set). if not validLibrary: @@ -1111,10 +1111,10 @@ class LinkageMapMachO(object): rValue.setdefault(lib, set()).add(install_name) if debug: if not os.path.isfile(lib): - print "Missing library:", lib + print(_("Missing library:"), lib) else: - print "Possibly missing symlink:", \ - install_name + print(_("Possibly missing symlink:"), \ + install_name) return rValue def listProviders(self): -- 2.26.2