diff options
-rw-r--r-- | morphlib/plugins/show_dependencies_plugin.py | 5 | ||||
-rw-r--r-- | morphlib/source.py | 2 | ||||
-rw-r--r-- | tests/show-dependencies.stdout | 248 |
3 files changed, 128 insertions, 127 deletions
diff --git a/morphlib/plugins/show_dependencies_plugin.py b/morphlib/plugins/show_dependencies_plugin.py index e214a92f..8d805a35 100644 --- a/morphlib/plugins/show_dependencies_plugin.py +++ b/morphlib/plugins/show_dependencies_plugin.py @@ -49,6 +49,7 @@ class ShowDependenciesPlugin(cliapp.Plugin): # traverse the morphs to list all the sources for repo, ref, filename in self.app.itertriplets(args): + morph = filename[:-len('.morph')] pool = self.app.create_source_pool( lrc, rrc, (repo, ref, filename)) @@ -56,7 +57,7 @@ class ShowDependenciesPlugin(cliapp.Plugin): artifacts = resolver.resolve_artifacts(pool) self.app.output.write('dependency graph for %s|%s|%s:\n' % - (repo, ref, filename)) + (repo, ref, morph)) for artifact in sorted(artifacts, key=str): self.app.output.write(' %s\n' % artifact) for dependency in sorted(artifact.dependencies, key=str): @@ -64,7 +65,7 @@ class ShowDependenciesPlugin(cliapp.Plugin): order = morphlib.buildorder.BuildOrder(artifacts) self.app.output.write('build order for %s|%s|%s:\n' % - (repo, ref, filename)) + (repo, ref, morph)) for group in order.groups: self.app.output.write(' group:\n') for artifact in group: diff --git a/morphlib/source.py b/morphlib/source.py index ed62ea4a..d4f1e119 100644 --- a/morphlib/source.py +++ b/morphlib/source.py @@ -51,4 +51,4 @@ class Source(object): def __str__(self): # pragma: no cover return '%s|%s|%s' % (self.repo_name, self.original_ref, - self.filename) + self.filename[:-len('.morph')]) diff --git a/tests/show-dependencies.stdout b/tests/show-dependencies.stdout index 3938e266..e58f5285 100644 --- a/tests/show-dependencies.stdout +++ b/tests/show-dependencies.stdout @@ -1,133 +1,133 @@ -dependency graph for test-repo|master|xfce-core.morph: - test-repo|master|cairo.morph|cairo - test-repo|master|dbus-glib.morph|dbus-glib - -> test-repo|master|dbus.morph|dbus - -> test-repo|master|glib.morph|glib - test-repo|master|dbus.morph|dbus - test-repo|master|exo.morph|exo - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4util.morph|libxfce4util - test-repo|master|fontconfig.morph|fontconfig - test-repo|master|freetype.morph|freetype - test-repo|master|garcon.morph|garcon - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4util.morph|libxfce4util - test-repo|master|gdk-pixbuf.morph|gdk-pixbuf - -> test-repo|master|glib.morph|glib - test-repo|master|glib.morph|glib - test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|cairo.morph|cairo - -> test-repo|master|dbus-glib.morph|dbus-glib - -> test-repo|master|dbus.morph|dbus - -> test-repo|master|fontconfig.morph|fontconfig - -> test-repo|master|freetype.morph|freetype - -> test-repo|master|gdk-pixbuf.morph|gdk-pixbuf - -> test-repo|master|glib.morph|glib - -> test-repo|master|gtk.morph|gtk - -> test-repo|master|pango.morph|pango - test-repo|master|gtk-xfce-engine.morph|gtk-xfce-engine - -> test-repo|master|garcon.morph|garcon - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|xfconf.morph|xfconf - test-repo|master|gtk.morph|gtk - -> test-repo|master|cairo.morph|cairo - -> test-repo|master|gdk-pixbuf.morph|gdk-pixbuf - -> test-repo|master|glib.morph|glib - -> test-repo|master|pango.morph|pango - test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|xfconf.morph|xfconf - test-repo|master|libxfce4util.morph|libxfce4util - -> test-repo|master|gtk-stack.morph|gtk-stack - test-repo|master|pango.morph|pango - -> test-repo|master|fontconfig.morph|fontconfig - -> test-repo|master|freetype.morph|freetype - test-repo|master|thunar.morph|thunar - -> test-repo|master|exo.morph|exo - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - test-repo|master|tumbler.morph|tumbler - -> test-repo|master|gtk-stack.morph|gtk-stack - test-repo|master|xfce-core.morph|xfce-core - -> test-repo|master|exo.morph|exo - -> test-repo|master|garcon.morph|garcon - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|gtk-xfce-engine.morph|gtk-xfce-engine - -> test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|libxfce4util.morph|libxfce4util - -> test-repo|master|thunar.morph|thunar - -> test-repo|master|tumbler.morph|tumbler - -> test-repo|master|xfce4-appfinder.morph|xfce4-appfinder - -> test-repo|master|xfce4-panel.morph|xfce4-panel - -> test-repo|master|xfce4-session.morph|xfce4-session - -> test-repo|master|xfce4-settings.morph|xfce4-settings - -> test-repo|master|xfconf.morph|xfconf - -> test-repo|master|xfdesktop.morph|xfdesktop - -> test-repo|master|xfwm4.morph|xfwm4 - test-repo|master|xfce4-appfinder.morph|xfce4-appfinder - -> test-repo|master|garcon.morph|garcon - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|xfconf.morph|xfconf - test-repo|master|xfce4-panel.morph|xfce4-panel - -> test-repo|master|exo.morph|exo - -> test-repo|master|garcon.morph|garcon - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - test-repo|master|xfce4-session.morph|xfce4-session - -> test-repo|master|exo.morph|exo - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|xfconf.morph|xfconf - test-repo|master|xfce4-settings.morph|xfce4-settings - -> test-repo|master|exo.morph|exo - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|xfconf.morph|xfconf - test-repo|master|xfconf.morph|xfconf - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4util.morph|libxfce4util - test-repo|master|xfdesktop.morph|xfdesktop - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|xfconf.morph|xfconf - test-repo|master|xfwm4.morph|xfwm4 - -> test-repo|master|gtk-stack.morph|gtk-stack - -> test-repo|master|libxfce4ui.morph|libxfce4ui - -> test-repo|master|xfconf.morph|xfconf -build order for test-repo|master|xfce-core.morph: +dependency graph for test-repo|master|xfce-core: + test-repo|master|cairo|cairo + test-repo|master|dbus-glib|dbus-glib + -> test-repo|master|dbus|dbus + -> test-repo|master|glib|glib + test-repo|master|dbus|dbus + test-repo|master|exo|exo + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4util|libxfce4util + test-repo|master|fontconfig|fontconfig + test-repo|master|freetype|freetype + test-repo|master|garcon|garcon + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4util|libxfce4util + test-repo|master|gdk-pixbuf|gdk-pixbuf + -> test-repo|master|glib|glib + test-repo|master|glib|glib + test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|cairo|cairo + -> test-repo|master|dbus-glib|dbus-glib + -> test-repo|master|dbus|dbus + -> test-repo|master|fontconfig|fontconfig + -> test-repo|master|freetype|freetype + -> test-repo|master|gdk-pixbuf|gdk-pixbuf + -> test-repo|master|glib|glib + -> test-repo|master|gtk|gtk + -> test-repo|master|pango|pango + test-repo|master|gtk-xfce-engine|gtk-xfce-engine + -> test-repo|master|garcon|garcon + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|xfconf|xfconf + test-repo|master|gtk|gtk + -> test-repo|master|cairo|cairo + -> test-repo|master|gdk-pixbuf|gdk-pixbuf + -> test-repo|master|glib|glib + -> test-repo|master|pango|pango + test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|xfconf|xfconf + test-repo|master|libxfce4util|libxfce4util + -> test-repo|master|gtk-stack|gtk-stack + test-repo|master|pango|pango + -> test-repo|master|fontconfig|fontconfig + -> test-repo|master|freetype|freetype + test-repo|master|thunar|thunar + -> test-repo|master|exo|exo + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + test-repo|master|tumbler|tumbler + -> test-repo|master|gtk-stack|gtk-stack + test-repo|master|xfce-core|xfce-core + -> test-repo|master|exo|exo + -> test-repo|master|garcon|garcon + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|gtk-xfce-engine|gtk-xfce-engine + -> test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|libxfce4util|libxfce4util + -> test-repo|master|thunar|thunar + -> test-repo|master|tumbler|tumbler + -> test-repo|master|xfce4-appfinder|xfce4-appfinder + -> test-repo|master|xfce4-panel|xfce4-panel + -> test-repo|master|xfce4-session|xfce4-session + -> test-repo|master|xfce4-settings|xfce4-settings + -> test-repo|master|xfconf|xfconf + -> test-repo|master|xfdesktop|xfdesktop + -> test-repo|master|xfwm4|xfwm4 + test-repo|master|xfce4-appfinder|xfce4-appfinder + -> test-repo|master|garcon|garcon + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|xfconf|xfconf + test-repo|master|xfce4-panel|xfce4-panel + -> test-repo|master|exo|exo + -> test-repo|master|garcon|garcon + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + test-repo|master|xfce4-session|xfce4-session + -> test-repo|master|exo|exo + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|xfconf|xfconf + test-repo|master|xfce4-settings|xfce4-settings + -> test-repo|master|exo|exo + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|xfconf|xfconf + test-repo|master|xfconf|xfconf + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4util|libxfce4util + test-repo|master|xfdesktop|xfdesktop + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|xfconf|xfconf + test-repo|master|xfwm4|xfwm4 + -> test-repo|master|gtk-stack|gtk-stack + -> test-repo|master|libxfce4ui|libxfce4ui + -> test-repo|master|xfconf|xfconf +build order for test-repo|master|xfce-core: group: - test-repo|master|glib.morph|glib - test-repo|master|freetype.morph|freetype - test-repo|master|fontconfig.morph|fontconfig + test-repo|master|glib|glib + test-repo|master|freetype|freetype + test-repo|master|fontconfig|fontconfig group: - test-repo|master|cairo.morph|cairo - test-repo|master|gdk-pixbuf.morph|gdk-pixbuf - test-repo|master|pango.morph|pango - test-repo|master|dbus.morph|dbus + test-repo|master|cairo|cairo + test-repo|master|gdk-pixbuf|gdk-pixbuf + test-repo|master|pango|pango + test-repo|master|dbus|dbus group: - test-repo|master|gtk.morph|gtk - test-repo|master|dbus-glib.morph|dbus-glib + test-repo|master|gtk|gtk + test-repo|master|dbus-glib|dbus-glib group: - test-repo|master|gtk-stack.morph|gtk-stack + test-repo|master|gtk-stack|gtk-stack group: - test-repo|master|libxfce4util.morph|libxfce4util + test-repo|master|libxfce4util|libxfce4util group: - test-repo|master|xfconf.morph|xfconf + test-repo|master|xfconf|xfconf group: - test-repo|master|exo.morph|exo - test-repo|master|libxfce4ui.morph|libxfce4ui - test-repo|master|garcon.morph|garcon + test-repo|master|exo|exo + test-repo|master|libxfce4ui|libxfce4ui + test-repo|master|garcon|garcon group: - test-repo|master|thunar.morph|thunar - test-repo|master|tumbler.morph|tumbler - test-repo|master|xfce4-panel.morph|xfce4-panel - test-repo|master|xfce4-settings.morph|xfce4-settings - test-repo|master|xfce4-session.morph|xfce4-session - test-repo|master|xfwm4.morph|xfwm4 - test-repo|master|xfdesktop.morph|xfdesktop - test-repo|master|xfce4-appfinder.morph|xfce4-appfinder - test-repo|master|gtk-xfce-engine.morph|gtk-xfce-engine + test-repo|master|thunar|thunar + test-repo|master|tumbler|tumbler + test-repo|master|xfce4-panel|xfce4-panel + test-repo|master|xfce4-settings|xfce4-settings + test-repo|master|xfce4-session|xfce4-session + test-repo|master|xfwm4|xfwm4 + test-repo|master|xfdesktop|xfdesktop + test-repo|master|xfce4-appfinder|xfce4-appfinder + test-repo|master|gtk-xfce-engine|gtk-xfce-engine group: - test-repo|master|xfce-core.morph|xfce-core + test-repo|master|xfce-core|xfce-core |