From d646915c04f14be8594947f6e2cb3954c90ab574 Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Mon, 8 Feb 2016 17:24:35 +0100 Subject: [PATCH] - allow to directly expand a non-link during "osc up -e" --- osc/commandline.py | 5 +++-- osc/core.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 83c20a38..f8782368 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -4705,9 +4705,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. # sys.exit(1) if not rev: - if opts.expand_link and p.islink() and not p.isexpanded(): + if opts.expand_link: rev = p.latest_rev(expand=True) - print('Expanding to rev', rev) + if p.islink() and not p.isexpanded(): + print('Expanding to rev', rev) elif opts.unexpand_link and p.islink() and p.isexpanded(): rev = show_upstream_rev(p.apiurl, p.prjname, p.name, meta=p.meta) print('Unexpanding to rev', rev) diff --git a/osc/core.py b/osc/core.py index de70545b..b379c5f2 100644 --- a/osc/core.py +++ b/osc/core.py @@ -2080,6 +2080,8 @@ rev: %s except: upstream_rev = show_upstream_xsrcmd5(self.apiurl, self.prjname, self.name, linkrev="base", meta=self.meta, include_service_files=include_service_files) self.mark_frozen() + elif not self.islink() and expand: + upstream_rev = show_upstream_xsrcmd5(self.apiurl, self.prjname, self.name, meta=self.meta, include_service_files=include_service_files) else: upstream_rev = show_upstream_rev(self.apiurl, self.prjname, self.name, meta=self.meta, include_service_files=include_service_files) return upstream_rev