On 15/06/2015 18:05, Ritesh Raj Sarraf wrote:
On Monday 15 June 2015 07:08 PM, Peter Laird wrote:
Changing to AptType="apt" works OK.
I tried doing an update, an upgrade and an install.
Compared with the original apt-offline v1.5, the .sig files and
corresponding .zip files for the upgrade and install were the same.
The .sig files and .zip files for the update were different, but the
original version 1.5 does not work for update.
Thanks Peter,
So I devise out of it that it should suffice ?
In that case, these changes are minimal and should be acceptable by the
release team. I'll roll something up in coming week and prep for stable.
I'll keep you posted through this bug report.
Attached is a patch for the changes that I tested.
I am happy that the change around line 1155 fixes bug#787730.
I am happy that the change around line 1798 fixes bug#787736.
I would also be happy if you made changes around line 1798 to match
version 1.6 because that would be equivalent to what I tested.
diff -ru orig/apt-offline-1.5/apt_offline_core/AptOfflineCoreLib.py
patch_method/apt-offline-1.5.patch_method/apt_offline_core/AptOfflineCoreLib.py
--- orig/apt-offline-1.5/apt_offline_core/AptOfflineCoreLib.py 2015-06-11
22:44:24.000000000 +0100
+++
patch_method/apt-offline-1.5.patch_method/apt_offline_core/AptOfflineCoreLib.py
2015-06-11 22:44:28.000000000 +0100
@@ -1155,7 +1155,7 @@
os.rename(temp_filename, filename)
else:
os.unlink(temp_filename)
- elif magicMIME.file( archive_file ) ==
"application/x-gnupg-keyring":
+ elif magicMIME.file( archive_file ) ==
"application/x-gnupg-keyring" or magicMIME.file( archive_file ) ==
"application/pgp-signature":
filename = os.path.join(apt_update_target_path,
filename)
shutil.copy2(archive_file, filename)
# PGP armored data should be bypassed
@@ -1798,7 +1798,7 @@
#Instantiate Apt based on what we have. For now, fall to apt only
- AptInst = AptManip(Str_SetArg, Simulate=Bool_TestWindows,
AptType="python-apt")
+ AptInst = AptManip(Str_SetArg, Simulate=Bool_TestWindows,
AptType="apt")
if Bool_SetUpdate:
if platform.system() in supported_platforms:
