Commit cb5c5751 by Craig Heffner

Updated deps.sh to install a known-working ubi_reader commit version.

parent 8cc9352c
...@@ -91,7 +91,10 @@ function install_unstuff ...@@ -91,7 +91,10 @@ function install_unstuff
function install_ubireader function install_ubireader
{ {
git clone https://github.com/jrspruitt/ubi_reader git clone https://github.com/jrspruitt/ubi_reader
(cd ubi_reader && $SUDO python setup.py install) # Some UBIFS extraction breaks after this commit, due to "Added fatal error check if UBI block extends beyond file size"
# (see this commit: https://github.com/jrspruitt/ubi_reader/commit/af678a5234dc891e8721ec985b1a6e74c77620b6)
# Reset to a known working commit.
(cd ubi_reader && git reset --hard 0955e6b95f07d849a182125919a1f2b6790d5b51 && $SUDO python setup.py install)
$SUDO rm -rf ubi_reader $SUDO rm -rf ubi_reader
} }
......
...@@ -564,6 +564,7 @@ class Extractor(Module): ...@@ -564,6 +564,7 @@ class Extractor(Module):
Returns the name of the extracted file (blank string if nothing was extracted). Returns the name of the extracted file (blank string if nothing was extracted).
''' '''
fname = '' fname = ''
rule = None
recurse = False recurse = False
original_dir = os.getcwd() original_dir = os.getcwd()
rules = self.match(description) rules = self.match(description)
...@@ -650,7 +651,10 @@ class Extractor(Module): ...@@ -650,7 +651,10 @@ class Extractor(Module):
os.chdir(original_dir) os.chdir(original_dir)
return (output_directory, fname, recurse, str(rule['cmd'])) if rule is not None:
return (output_directory, fname, recurse, str(rule['cmd']))
else:
return (output_directory, fname, recurse, '')
def _entry_offset(self, index, entries, description): def _entry_offset(self, index, entries, description):
''' '''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment