mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-04 10:36:17 +01:00
Code

- cat: simplify the code a bit; don't print header and footer lines

Browse Source 
- unification of the help output of some commands
This commit is contained in:
Dr. Peter Poeml 2007-12-10 14:23:58 +00:00
parent 7826163ca2
commit 6781119d43
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osc/commandline.py
View File

@ -606,7 +606,7 @@ class Osc(cmdln.Cmdln):
@cmdln.option('-r', '--revision', metavar='N[:M]', @cmdln.option('-r', '--revision', metavar='N[:M]',
help='revision id, where N = old revision and M = new revision') help='revision id, where N = old revision and M = new revision')
def do_rdiff(self, subcmd, opts, new_project, new_package): def do_rdiff(self, subcmd, opts, new_project, new_package):
"""${cmd_name}: server-side "pretty" diff of two packages """${cmd_name}: Server-side "pretty" diff of two packages
If neither OLDPRJ nor OLDPKG are specified, the diff is against the If neither OLDPRJ nor OLDPKG are specified, the diff is against the
last revision, thus showing the latest change. last revision, thus showing the latest change.
@ -633,7 +633,7 @@ class Osc(cmdln.Cmdln):
def do_repourls(self, subcmd, opts, *args): def do_repourls(self, subcmd, opts, *args):
"""${cmd_name}: shows URLs of .repo files """${cmd_name}: Shows URLs of .repo files
Shows URLs on which to access the project .repos files (yum-style Shows URLs on which to access the project .repos files (yum-style
metadata) on download.opensuse.org. metadata) on download.opensuse.org.
@ -661,7 +661,7 @@ class Osc(cmdln.Cmdln):
'this option is ignored!') 'this option is ignored!')
@cmdln.alias('co') @cmdln.alias('co')
def do_checkout(self, subcmd, opts, *args): def do_checkout(self, subcmd, opts, *args):
"""${cmd_name}: check out content from the repository """${cmd_name}: Check out content from the repository
Check out content from the repository server, creating a local working Check out content from the repository server, creating a local working
copy. copy.
@ -1600,7 +1600,7 @@ class Osc(cmdln.Cmdln):
@cmdln.option('-v', '--verbose', action='store_true', @cmdln.option('-v', '--verbose', action='store_true',
help='show more information') help='show more information')
def do_search(self, subcmd, opts, *args): def do_search(self, subcmd, opts, *args):
"""${cmd_name}: search for a project and/or package. """${cmd_name}: Search for a project and/or package.
If no option is specified osc will search for projects and If no option is specified osc will search for projects and
packages which contains the \'search term\' in their name, packages which contains the \'search term\' in their name,
@ -1668,7 +1668,7 @@ class Osc(cmdln.Cmdln):
@cmdln.option('-c', '--commit', action='store_true', @cmdln.option('-c', '--commit', action='store_true',
help='commit the new files') help='commit the new files')
def do_importsrcpkg(self, subcmd, opts, srpm): def do_importsrcpkg(self, subcmd, opts, srpm):
"""${cmd_name}: import a new package from a src.rpm """${cmd_name}: Import a new package from a src.rpm
A new package dir will be created inside the project dir A new package dir will be created inside the project dir
(if no project is specified and the current working dir is a (if no project is specified and the current working dir is a
@ -1896,7 +1896,7 @@ class Osc(cmdln.Cmdln):
def do_cat(self, subcmd, opts, *args): def do_cat(self, subcmd, opts, *args):
"""${cmd_name}: print file on the standard output """${cmd_name}: Output the content of a file to standard output
Examples: Examples:
osc cat project package file osc cat project package file
@ -1910,22 +1910,19 @@ class Osc(cmdln.Cmdln):
if len(args) != 3: if len(args) != 3:
print >>sys.stderr, 'error - incorrect number of arguments' print >>sys.stderr, 'error - incorrect number of arguments'
sys.exit(1) sys.exit(1)
import tempfile import tempfile
(fd, filename) = tempfile.mkstemp(prefix = 'osc_%s.' % args[2], dir = '/tmp') (fd, filename) = tempfile.mkstemp(prefix = 'osc_%s.' % args[2], dir = '/tmp')
get_source_file(conf.config['apiurl'], args[0], args[1], args[2], targetfilename=filename) get_source_file(conf.config['apiurl'], args[0], args[1], args[2], targetfilename=filename)
if binary_file(filename): if binary_file(filename):
print >>sys.stderr, 'error - cannot display binary file \'%s\'' % args[2] print >>sys.stderr, 'error - cannot display binary file \'%s\'' % args[2]
else: else:
print '### Beginning of file: \'%s\' ###' % filename for line in open(filename):
while True: print line
buf = os.read(fd, BUFSIZE)
if not buf:
break
else:
print buf
print '### End of file ###'
try: try:
os.close(fd)
os.unlink(filename) os.unlink(filename)
except: except:
pass pass