File 0001-Default-to-the-new-filename-when-none-exis... of Package rapidquilt

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Default-to-the-new-filename-when-none-exists.patch of Package rapidquilt (Revision 2a9600bcd3c1ddba522d49692e854194)

Currently displaying revision 2a9600bcd3c1ddba522d49692e854194 , Show latest

From 3e6b3c7f4407335bfd6c34e02f108804c8c5831e Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@suse.com>
Date: Tue, 19 Feb 2019 10:06:33 +0100
Subject: [PATCH] Default to the new filename when none exists

This happens only when a patch is creating new file and doesn't use /dev/null
special filenames, but instead uses two filenames in --- and +++ lines and each
is different.

In that case we must choose the new filename (+++ line).
---
 src/rapidquilt/apply/common.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rapidquilt/apply/common.rs b/src/rapidquilt/apply/common.rs
index 9ea56be..5c45ee9 100644
--- a/src/rapidquilt/apply/common.rs
+++ b/src/rapidquilt/apply/common.rs
@@ -208,8 +208,8 @@ pub fn choose_filename_to_patch<'a, H: BuildHasher>(
                 return new_filename;
             }
 
-            // Otherwise return the old one
-            old_filename
+            // Otherwise return the new one
+            new_filename
         }
 
         (None, None) => {
-- 
2.16.4

Places

File 0001-Default-to-the-new-filename-when-none-exists.patch of Package rapidquilt (Revision 2a9600bcd3c1ddba522d49692e854194)

Places