mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-21 22:18:52 +02:00
Code Activity

* revert rev=latest change, let mls do it right in all places.

Browse Source 
* add hint to use "osc repairlink" on failed operations with links
* use correct target project and package name on repairlink
This commit is contained in:
Adrian Schröter
2009-04-22 12:32:29 +00:00
parent 0c3d982ecc
commit 9dfaf611f3
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osc/babysitter.py
View File

@@ -75,6 +75,7 @@ def run(prg):
except oscerr.LinkExpandError, e: except oscerr.LinkExpandError, e:
print >>sys.stderr, 'Link cannot be expanded:\n', e print >>sys.stderr, 'Link cannot be expanded:\n', e
print >>sys.stderr, 'Use "osc repairlink" to fix merge conflicts.\n'
return 1 return 1
except (oscerr.NoWorkingCopy, oscerr.WorkingCopyWrongVersion), e: except (oscerr.NoWorkingCopy, oscerr.WorkingCopyWrongVersion), e:

5
osc/commandline.py
View File

@@ -1212,6 +1212,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
expand_link=expand_link, prj_dir=project) expand_link=expand_link, prj_dir=project)
except oscerr.LinkExpandError, e: except oscerr.LinkExpandError, e:
print >>sys.stderr, 'Link cannot be expanded:\n', e print >>sys.stderr, 'Link cannot be expanded:\n', e
print >>sys.stderr, 'Use "osc repairlink" for fixing merge conflicts:\n'
# check out in unexpanded form at least # check out in unexpanded form at least
checkout_package(apiurl, project, package, checkout_package(apiurl, project, package,
expand_link=False, prj_dir=project) expand_link=False, prj_dir=project)
@@ -2813,8 +2814,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
dir_new = {'apiurl': apiurl} dir_new = {'apiurl': apiurl}
dir_new['srcmd5'] = root_new.get('srcmd5') dir_new['srcmd5'] = root_new.get('srcmd5')
dir_new['entries'] = map(lambda e: [e.get('name'), e.get('md5')], root_new.findall('entry')) dir_new['entries'] = map(lambda e: [e.get('name'), e.get('md5')], root_new.findall('entry'))
dir_new['project'] = linkinfo.get('project') dir_new['project'] = prj
dir_new['package'] = linkinfo.get('package') dir_new['package'] = package
query = { 'rev': lastworkingrev } query = { 'rev': lastworkingrev }
u = makeurl(apiurl, ['source', prj, package], query=query) u = makeurl(apiurl, ['source', prj, package], query=query)

3
osc/core.py
View File

@@ -2415,9 +2415,6 @@ def checkout_package(apiurl, project, package,
if not prj_dir: if not prj_dir:
prj_dir = olddir prj_dir = olddir
if not revision:
revision = "latest"
if not pathname: if not pathname:
pathname = getTransActPath(os.path.join(prj_dir, package)) pathname = getTransActPath(os.path.join(prj_dir, package))