From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <darktemplar@altlinux.org>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on
 sa.local.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00
 autolearn=unavailable autolearn_force=no version=3.4.1
From: Aleksei Nikiforov <darktemplar@altlinux.org>
To: devel@lists.altlinux.org
Date: Fri,  6 Dec 2019 15:24:02 +0300
Message-Id: <20191206122402.81986-1-darktemplar@altlinux.org>
X-Mailer: git-send-email 2.24.0
In-Reply-To: <20191206121216.GB25049@altlinux.org>
References: <20191206121216.GB25049@altlinux.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Cc: Aleksei Nikiforov <darktemplar@altlinux.org>
Subject: [devel] [PATCH for apt v2] Fix copying release information from
	cdrom
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Dec 2019 12:24:14 -0000
Archived-At: <http://lore.altlinux.org/devel/20191206122402.81986-1-darktemplar@altlinux.org/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

Fixes: https://bugzilla.altlinux.org/37531
---
 apt/cmdline/rpmindexcopy.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apt/cmdline/rpmindexcopy.cc b/apt/cmdline/rpmindexcopy.cc
index 6d5a414..06b391a 100644
--- a/apt/cmdline/rpmindexcopy.cc
+++ b/apt/cmdline/rpmindexcopy.cc
@@ -180,10 +180,10 @@ bool RPMIndexCopy::CopyPackages(const string &CDROM,const string &Name,vector<st
 		     release.c_str());
 	    string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
 	    TargetF += URItoFileName(S);
-	    if (FileExists(RipDirectory(*I) + release) == true)
+	    if (FileExists(RipDirectory(*I) + "/" + release) == true)
 	    {
 	       FileFd Target(TargetF,FileFd::WriteEmpty);
-	       FileFd Rel(RipDirectory(*I) + release,FileFd::ReadOnly);
+	       FileFd Rel(RipDirectory(*I) + "/" + release,FileFd::ReadOnly);
 	       if (_error->PendingError() == true)
 		  return false;
 	       
-- 
2.24.0