mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-11 07:06:16 +01:00
Code

Merge branch 'master' of git://gitorious.org/opensuse/osc

Browse Source
This commit is contained in:
Marcus Huewe 2010-05-09 21:29:42 +02:00
commit 5bfbf5b1a9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osc/commandline.py
View File

@ -1565,11 +1565,6 @@ Please submit there instead, or use --nodevelproject to force direct submission.
else:
dst_apiurl = src_apiurl
if src_project == dst_project and \
src_package == dst_package and \
src_apiurl == dst_apiurl:
raise oscerr.WrongArgs('Source and destination are the same.')
if src_apiurl != dst_apiurl:
opts.client_side_copy = True
@ -1582,6 +1577,12 @@ Please submit there instead, or use --nodevelproject to force direct submission.
rev = show_upstream_rev(src_apiurl, src_project, src_package)
comment = 'osc copypac from project:%s package:%s revision:%s' % ( src_project, src_package, rev )
if src_project == dst_project and \
src_package == dst_package and \
not rev and \
src_apiurl == dst_apiurl:
raise oscerr.WrongArgs('Source and destination are the same.')
r = copy_pac(src_apiurl, src_project, src_package,
dst_apiurl, dst_project, dst_package,
client_side_copy=opts.client_side_copy,