openharmony/third_party_cups
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_cups synced 2024-11-23 01:49:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改install.py和ppd不生成的patch

Browse Source 
Signed-off-by: yyc1234 <leyunchi@huawei.com>
This commit is contained in:
yyc1234 2024-11-12 06:34:52 +00:00 committed by Gitee
parent 3f257d7736
commit ef5b40ecd2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install.py
View File

@ -66,7 +66,7 @@ def apply_patch(patch_file, target_dir):
patch_cmd = ['patch', '-p1', "--fuzz=0", "--no-backup-if-mismatch", '-i', patch_file, '-d', target_dir] patch_cmd = ['patch', '-p1', "--fuzz=0", "--no-backup-if-mismatch", '-i', patch_file, '-d', target_dir]
subprocess.run(patch_cmd, check=True) subprocess.run(patch_cmd, check=True)
except Exception as e: except Exception as e:
print("apply_patch error!") print(f"apply_patch error! patch: {patch_file}")
return return

6
ohos-ppdfile-not-generated.patch
View File

@ -1,7 +1,7 @@
diff --git a/cups-2.4.0/scheduler/ipp.c b/cups-2.4.0/scheduler/ipp.c diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 5972b99..9d3cf35 100644 index 5972b99..9d3cf35 100644
--- a/cups-2.4.0/scheduler/ipp.c --- a/scheduler/ipp.c
+++ b/cups-2.4.0/scheduler/ipp.c +++ b/scheduler/ipp.c
@@ -5325,7 +5325,8 @@ create_local_bg_thread( @@ -5325,7 +5325,8 @@ create_local_bg_thread(
cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Get-Printer-Attributes returned %s (%s)", printer->name, ippErrorString(cupsLastError()), cupsLastErrorString()); cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Get-Printer-Attributes returned %s (%s)", printer->name, ippErrorString(cupsLastError()), cupsLastErrorString());