diff options
author | Papoteur <papoteur@mageialinux-online.org> | 2016-05-29 14:44:38 +0200 |
---|---|---|
committer | Papoteur <papoteur@mageialinux-online.org> | 2016-05-29 14:44:38 +0200 |
commit | 26f45c6548d4671b1792dbcf8411929f8ec145ae (patch) | |
tree | 0b758f801cbb41a998b61ab6635794f0ac5035a9 | |
parent | 62adf7a95c70bf83890587f3d7d6f58e86ae12a3 (diff) | |
parent | 3e3e90e699192df60eeafb2ec7a9e087aff97195 (diff) | |
download | mgarepo-26f45c6548d4671b1792dbcf8411929f8ec145ae.tar mgarepo-26f45c6548d4671b1792dbcf8411929f8ec145ae.tar.gz mgarepo-26f45c6548d4671b1792dbcf8411929f8ec145ae.tar.bz2 mgarepo-26f45c6548d4671b1792dbcf8411929f8ec145ae.tar.xz mgarepo-26f45c6548d4671b1792dbcf8411929f8ec145ae.zip |
Add commits before python3 divergence
Merge commit '3e3e90e699192df60eeafb2ec7a9e087aff97195' into topic/python2
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | MgaRepo/commands/sync.py | 7 | ||||
-rw-r--r-- | MgaRepo/rpmutil.py | 3 | ||||
-rw-r--r-- | MgaRepo/svn.py | 4 | ||||
-rw-r--r-- | MgaRepo/util.py | 7 |
5 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,6 @@ +* 1.10.7 +- ignore 'mgarepo sync -c' and tell it's deprecated + * 1.10.6 - s/cooker/cauldron/ thus fixing some stupid upload errors related to backports diff --git a/MgaRepo/commands/sync.py b/MgaRepo/commands/sync.py index 71f5510..54f5635 100644 --- a/MgaRepo/commands/sync.py +++ b/MgaRepo/commands/sync.py @@ -11,7 +11,6 @@ in the spec file. It will not commit the changes. Options: - -c Commit the changes, as in ci --dry-run Print results without changing the working copy --download -d Try to download the source files not found @@ -25,11 +24,17 @@ def parse_options(): parser = OptionParser(help=HELP) parser.add_option("--dry-run", dest="dryrun", default=False, action="store_true") + # TODO: + # Completely remove -c switch from code parser.add_option("-c", dest="commit", default=False, action="store_true") parser.add_option("-d", "--download", dest="download", default=False, action="store_true") opts, args = parser.parse_args() + # TODO: + # Completely remove -c switch from code + if opts.commit: + parser.error("Option -c is deprecated and should not be used anymore!") if len(args): opts.target = args[0] return opts diff --git a/MgaRepo/rpmutil.py b/MgaRepo/rpmutil.py index 84ebf52..9d82951 100644 --- a/MgaRepo/rpmutil.py +++ b/MgaRepo/rpmutil.py @@ -488,7 +488,8 @@ def checkout(pkgdirurl, path=None, revision=None, branch=None, distro=None, mirror.info(current, write=True) svn = SVN() svn.checkout(current, path, rev=revision, show=1) - binrepo.download_binaries(path) + if not spec: + binrepo.download_binaries(path) def getpkgtopdir(basedir=None): #FIXME this implementation doesn't work well with relative path names, diff --git a/MgaRepo/svn.py b/MgaRepo/svn.py index da3eee7..89de8f9 100644 --- a/MgaRepo/svn.py +++ b/MgaRepo/svn.py @@ -33,6 +33,10 @@ class SVN: svn_command = config.get("global", "svn-command", "svn") cmdstr = svn_command + " " + " ".join(args) try: + if args[0] == 'info': + kwargs['info'] = True + else: + kwargs['info'] = False return execcmd(cmdstr, **kwargs) except Error, e: msg = None diff --git a/MgaRepo/util.py b/MgaRepo/util.py index 62ac32e..54348d6 100644 --- a/MgaRepo/util.py +++ b/MgaRepo/util.py @@ -56,8 +56,11 @@ def execcmd(*cmd, **kwargs): status = os.system(cmdstr) output = "" else: - status, output = commands_getstatusoutput( - "LANG=C LANGUAGE=C LC_ALL=C "+cmdstr) + if kwargs.get('info'): + prefix='LANGUAGE=C ' + else: + prefix='LANG=C LANGUAGE=C LC_ALL=C ' + status, output = commands_getstatusoutput(prefix + cmdstr) verbose = config.getbool("global", "verbose", 0) if status != 0 and not kwargs.get("noerror"): if kwargs.get("cleanerr") and not verbose: |