diff options
| -rw-r--r-- | g_octave/cli.py | 8 | ||||
| -rw-r--r-- | share/g-octave.eclass | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/g_octave/cli.py b/g_octave/cli.py index 0e18a09..d5b4750 100644 --- a/g_octave/cli.py +++ b/g_octave/cli.py @@ -218,7 +218,7 @@ class Cli: ) # checking if the overlay is properly configured - self.pkg_manager.check_overlay(config.overlay, out): + if not self.pkg_manager.check_overlay(config.overlay, out): raise GOctaveError('Overlay not properly configured.') def _init_ebuild(self): @@ -386,13 +386,13 @@ class Cli: try: return self._run() except GOctaveError as err: - log.error(unicode(err)) - out.eerror(unicode(err)) + log.error(str(err)) + out.eerror(str(err)) return os.EX_USAGE except Exception as err: tb = traceback.format_exc() log.error(tb) - out.eerror('Unknown error - ' + unicode(err)) + out.eerror('Unknown error - ' + str(err)) fd, filename = tempfile.mkstemp(prefix='g-octave-', suffix='.log') error_log = 'Command: ' + ' '.join(sys.argv) + '\n\n' + tb if os.write(fd, error_log) != len(error_log): diff --git a/share/g-octave.eclass b/share/g-octave.eclass index b672157..bf30bdf 100644 --- a/share/g-octave.eclass +++ b/share/g-octave.eclass @@ -15,10 +15,10 @@ G_OCTAVE_CAT="${G_OCTAVE_CAT:-main}" REPO_URI="https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge" if [[ ${PV} = 9999* ]]; then - inherit subversion autotools base + inherit base subversion autotools ESVN_REPO_URI="${REPO_URI}/${G_OCTAVE_CAT}/${PN}" else - inherit autotools base + inherit base autotools SRC_URI="mirror://sourceforge/octave/${P}.tar.gz" fi |