1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-11 16:36:14 +01:00

- avoid to create a _pull file when having a working copy (or the user runs in a dead end,

since we don't support pull on pulled sources, what is actually another bug)
This commit is contained in:
Adrian Schröter 2011-02-14 12:26:51 +01:00
parent a86c7b9311
commit 380f41b9a4

View File

@ -6026,6 +6026,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
raise oscerr.WrongArgs('Please commit your local changes first!')
# check if we need to update
upstream_rev = p.latest_rev()
if not (p.isfrozen() or p.ispulled()):
raise oscerr.WrongArgs('osc pull makes only sense with a detached head, did you mean osc up?')
if p.rev != upstream_rev:
raise oscerr.WorkingCopyOutdated((p.absdir, p.rev, upstream_rev))
elif not p.islink():