aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2007-01-02 15:23:10 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2007-01-02 15:23:10 +0000
commit275cab2de13197085229b0478ecebb1859036092 (patch)
tree6f49be14b4dd154762e29a12ffa133b217df0017
parent5c5b3e1f3304f55aa3467dae63d8cbdcdec59163 (diff)
downloadmgarepo-275cab2de13197085229b0478ecebb1859036092.tar
mgarepo-275cab2de13197085229b0478ecebb1859036092.tar.gz
mgarepo-275cab2de13197085229b0478ecebb1859036092.tar.bz2
mgarepo-275cab2de13197085229b0478ecebb1859036092.tar.xz
mgarepo-275cab2de13197085229b0478ecebb1859036092.zip
Make source lines fit in 80 columns
-rw-r--r--RepSys/log.py3
-rw-r--r--RepSys/rpmutil.py3
-rw-r--r--RepSys/svn.py3
-rw-r--r--RepSys/util.py3
4 files changed, 8 insertions, 4 deletions
diff --git a/RepSys/log.py b/RepSys/log.py
index 152abb0..b2e9321 100644
--- a/RepSys/log.py
+++ b/RepSys/log.py
@@ -316,7 +316,8 @@ def svn2rpm(pkgdirurl, rev=None, size=None, submit=False, template=None):
parse_markrelease_log(relentry)
except InvalidEntryError:
continue
- releasesdata.append((relrevision, -relentry.revision, relentry, version, release))
+ releasesdata.append((relrevision, -relentry.revision, relentry,
+ version, release))
releasesdata.sort()
# collect valid releases using the versions provided by the changes and
diff --git a/RepSys/rpmutil.py b/RepSys/rpmutil.py
index 872dc99..8cc6244 100644
--- a/RepSys/rpmutil.py
+++ b/RepSys/rpmutil.py
@@ -93,7 +93,8 @@ def get_srpm(pkgdirurl,
targetdirs = (".",)
targetsrpms = []
for targetdir in targetdirs:
- targetsrpm = os.path.join(os.path.realpath(targetdir), os.path.basename(srpm))
+ targetsrpm = os.path.join(os.path.realpath(targetdir),
+ os.path.basename(srpm))
targetsrpms.append(targetsrpm)
if verbose:
sys.stderr.write("Wrote: %s\n" % targetsrpm)
diff --git a/RepSys/svn.py b/RepSys/svn.py
index 1483a02..4e073dc 100644
--- a/RepSys/svn.py
+++ b/RepSys/svn.py
@@ -205,7 +205,8 @@ class SVN:
return [x.split() for x in output.split()]
return None
- def merge(self, url1, url2=None, rev1=None, rev2=None, path=None, **kwargs):
+ def merge(self, url1, url2=None, rev1=None, rev2=None, path=None,
+ **kwargs):
cmd = ["merge"]
if rev1 and rev2 and not url2:
cmd.append("-r")
diff --git a/RepSys/util.py b/RepSys/util.py
index 8c66199..83f2ebe 100644
--- a/RepSys/util.py
+++ b/RepSys/util.py
@@ -29,7 +29,8 @@ def execcmd(*cmd, **kwargs):
status = os.system(cmdstr)
output = ""
else:
- status, output = commands_getstatusoutput("LANG=C LANGUAGE=C LC_ALL=C "+cmdstr)
+ status, output = commands_getstatusoutput(
+ "LANG=C LANGUAGE=C LC_ALL=C "+cmdstr)
if status != 0 and not kwargs.get("noerror"):
raise Error, "command failed: %s\n%s\n" % (cmdstr, output)
if config.getbool("global", "verbose", 0):