From commits-return-71029-archive-asf-public=cust-asf.ponee.io@maven.apache.org Sat Mar 3 11:06:03 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id BE27E180671 for ; Sat, 3 Mar 2018 11:06:02 +0100 (CET) Received: (qmail 68481 invoked by uid 500); 3 Mar 2018 10:06:01 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 68472 invoked by uid 99); 3 Mar 2018 10:06:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Mar 2018 10:06:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A97D3DFCAF; Sat, 3 Mar 2018 10:06:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: olamy@apache.org To: commits@maven.apache.org Date: Sat, 03 Mar 2018 10:06:01 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] maven-scm git commit: [SCM-864] fix module name not passed to cvs rls Repository: maven-scm Updated Branches: refs/heads/master 9282d0ed1 -> 558d49694 [SCM-864] fix module name not passed to cvs rls Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/83b9c548 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/83b9c548 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/83b9c548 Branch: refs/heads/master Commit: 83b9c548d99b361da800b2da1204f4f182bd6483 Parents: 6f7dd0c Author: Ilya Basin Authored: Sun Feb 18 11:10:48 2018 +0300 Committer: Ilya Basin Committed: Sun Feb 18 13:26:36 2018 +0300 ---------------------------------------------------------------------- .../cvslib/command/list/AbstractCvsListCommand.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/83b9c548/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java index 5c7d1d0..58a00b4 100644 --- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java +++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java @@ -65,6 +65,16 @@ public abstract class AbstractCvsListCommand cl.createArg().setValue( "-R" ); } + String modulePref = repository.getModule(); + if ( !StringUtils.isEmpty( modulePref ) ) + { + modulePref += File.separatorChar; + } + else + { + modulePref = ""; + } + for ( Iterator it = fileSet.getFileList().iterator(); it.hasNext(); ) { File target = (File) it.next(); @@ -73,6 +83,7 @@ public abstract class AbstractCvsListCommand { path = path.substring( 1 ); } + path = modulePref + path; cl.createArg().setValue( path ); }