diff --git a/0001-download-the-rpm-package-in-the-system.patch b/0001-download-the-rpm-package-in-the-system.patch new file mode 100644 index 0000000000000000000000000000000000000000..68aa7f4b36ac4905fcf5ffee7b163dce91d6b277 --- /dev/null +++ b/0001-download-the-rpm-package-in-the-system.patch @@ -0,0 +1,37 @@ +From d0e28ae440b4129eebff1b53d18f42d48ef0156c Mon Sep 17 00:00:00 2001 +From: xuezhixin +Date: Mon, 13 Nov 2023 14:59:04 +0800 +Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=BD=AF=E4=BB=B6=E5=8C=85?= + =?UTF-8?q?=E5=92=8C=E4=B8=8B=E8=BD=BD=E7=9A=84=E8=BD=AF=E4=BB=B6=E5=8C=85?= + =?UTF-8?q?=E5=AF=B9=E5=BA=94?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + sysmig_agent/Abisystmcompchk.py | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/sysmig_agent/Abisystmcompchk.py b/sysmig_agent/Abisystmcompchk.py +index 0b5c519..eab8322 100644 +--- a/sysmig_agent/Abisystmcompchk.py ++++ b/sysmig_agent/Abisystmcompchk.py +@@ -818,3 +818,15 @@ def switch_write_migrate_report(report_name, num, flag): + with open(abi_incomp_chk, 'r') as fr_incomp: + column_incomp_list = fr_incomp.readlines() + write_row_by_row(report_name, column_incomp_list, 2, 0, num) ++ ++ ++def get_system_unique_pkg(current_pkg_list, download_pkg_list): ++ # clean history data ++ if os.path.exists(current_system_unique): ++ os.remove(current_system_unique) ++ ++ fcw = open(current_system_unique, 'w') ++ for data in set(current_pkg_list).difference(set(download_pkg_list)): ++ fcw.write(data + '\n') ++ fcw.close() ++ +-- +2.20.1 + diff --git a/0001-fix-export-error-and-no-migration-details-issue.patch b/0001-fix-export-error-and-no-migration-details-issue.patch deleted file mode 100644 index 98f7b61ead078bd632257db02b3ddd3e6e650f50..0000000000000000000000000000000000000000 --- a/0001-fix-export-error-and-no-migration-details-issue.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 854c1d018b9a5f1079f387101c62f86009c3baac Mon Sep 17 00:00:00 2001 -From: Super User -Date: Mon, 21 Aug 2023 16:19:47 +0800 -Subject: [PATCH] fix export error and no migration details issue - ---- - ut-Migration-tools/index.py | 4 ++-- - ut-Migration-tools/templates/MT_migration.html | 3 ++- - ut-Migration-tools/views/migration.py | 6 +++++- - 3 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/ut-Migration-tools/index.py b/ut-Migration-tools/index.py -index 59e6830..635c5ac 100644 ---- a/ut-Migration-tools/index.py -+++ b/ut-Migration-tools/index.py -@@ -218,7 +218,7 @@ def MT_export_migration_reports(): - :return: - """ - mod = check_methods() -- f = open("/usr/lib/migration-tools-agent/.passwd.txt","r") -+ f = open("/usr/lib/migration-tools-server/.passwd.txt","r") - password = f.read() - f.close() - if mod: -@@ -234,7 +234,7 @@ def MT_export_migration_reports(): - print("export report mkdir error:%s" % mkdir_log_pwd) - - info = mod.split(',') -- scp_log = "sshpass -p %s" % password + " scp -r %s" % json_data.get('info').split("|")[0] + "@%s" % info[1] \ -+ scp_log = "sshpass -p '%s'" % password + " scp -r %s" % json_data.get('info').split("|")[0] + "@%s" % info[1] \ - + ":/var/tmp/uos-migration/UOS*.tar.gz /var/uos-migration/" - try: - os.system(scp_log) -diff --git a/ut-Migration-tools/templates/MT_migration.html b/ut-Migration-tools/templates/MT_migration.html -index 39bed0b..77bf56a 100644 ---- a/ut-Migration-tools/templates/MT_migration.html -+++ b/ut-Migration-tools/templates/MT_migration.html -@@ -65,7 +65,8 @@ -