diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-12 16:32:55 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-12 16:32:55 -0300 |
commit | e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00 (patch) | |
tree | da2f71ca3469aea362df4b9885b01bcc068bfc91 /pcr/font-manager/2003-file-roller-syntax-fix.patch | |
parent | 6abc75d5f0c4d5c8302715a7da59cc02d22fbe36 (diff) | |
parent | 8d0f4ac4cbf56fc5c5cadb5ba09c35e3674a886b (diff) | |
download | abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.gz abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.bz2 abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.zip |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/tomb/PKGBUILD
Diffstat (limited to 'pcr/font-manager/2003-file-roller-syntax-fix.patch')
-rw-r--r-- | pcr/font-manager/2003-file-roller-syntax-fix.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pcr/font-manager/2003-file-roller-syntax-fix.patch b/pcr/font-manager/2003-file-roller-syntax-fix.patch new file mode 100644 index 000000000..229e13dc6 --- /dev/null +++ b/pcr/font-manager/2003-file-roller-syntax-fix.patch @@ -0,0 +1,22 @@ +--- font-manager/src/utils/common.py 2010-12-20 12:47:37.000000000 +0800 ++++ font-manager/src/utils/common.py 2013-06-12 22:09:06.296985078 +0800 +@@ -146,7 +146,7 @@ + + If delete is True, folder will be deleted afterwards + """ +- archiver = """file-roller -a '{0}.{1}' '{2}'""".format(arch_name, ++ archiver = """file-roller --add-to='{0}.{1}' '{2}'""".format(arch_name, + arch_type, folder) + os.chdir(destination) + roller = subprocess.Popen(shlex.split(archiver)) +--- font-manager/src/core/fonts.py 2010-12-20 13:14:43.000000000 +0800 ++++ font-manager/src/core/fonts.py 2013-06-12 22:26:29.084669145 +0800 +@@ -524,7 +524,7 @@ + tmp_dir = tempfile.mkdtemp(suffix='-font-manager', prefix='tmp-') + arch_dir = join(tmp_dir, dir_name) + os.mkdir(arch_dir) +- subprocess.call(['file-roller', '-e', arch_dir, filepath]) ++ subprocess.call(['file-roller', '--extract-to=' + arch_dir, filepath]) + # Todo: Need to check whether archive actually contained any fonts + # if user_is_stupid: + # self.notify() |