@@ -30,13 +30,12 @@ make VERBOSE=1 %{?_smp_mflags}

 make PREFIX=%{buildroot}/usr install

 install -vdm 0755 %{buildroot}/%{_lib}

 install -vdm 0755 %{buildroot}/bin

-cp -v bzip2-shared %{buildroot}/bin/bzip2

 cp -av libbz2.so* %{buildroot}/%{_lib}

 install -vdm 755 %{buildroot}%{_libdir}

 ln -sv ../../%{_lib}/libbz2.so.1.0 %{buildroot}%{_libdir}/libbz2.so

 rm -v %{buildroot}%{_bindir}/{bunzip2,bzcat}

-ln -sv bzip2 %{buildroot}/bin/bunzip2

-ln -sv bzip2 %{buildroot}/bin/bzcat

+ln -sv bzip2 %{buildroot}/usr/bin/bunzip2

+ln -sv bzip2 %{buildroot}/usr/bin/bzcat

 find %{buildroot} -name '*.a'  -delete

 %check

 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

@@ -44,9 +43,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %postun	-p /sbin/ldconfig

 %files

 %defattr(-,root,root)

-/bin/bzip2

-/bin/bzcat

-/bin/bunzip2

+%{_bindir}/bzcat

+%{_bindir}/bunzip2

 %{_bindir}/bzless

 %{_bindir}/bzgrep

 %{_bindir}/bzip2

@@ -42,12 +42,18 @@ class pullSources:

             f.close()

         return sha1.hexdigest()

-    def downloadFile(self, sources_dir, filename, sha1 = None):

-        file_path = os.path.join(sources_dir, filename)

-        # check if file exists and has the same sha1

-        if os.path.isfile(file_path) and sha1 == self.getFileHash(file_path):

-            return file_path

-

+    def downloadExistingFilePrompt(self, filename):

+        yes = ['yes', 'y']

+        no = ['no', 'n']

+        while True:

+            prompt = "Found a different local copy of {0}. Do you want to replace it? [y/n]:".format(filename)

+            answer = raw_input(prompt).lower()

+            if answer in yes:

+                return True

+            elif answer in no:

+                return False

+

+    def downloadFile(self, filename, file_path):

         print 'Downloading %s...' % filename

         #form url: https://dl.bintray.com/vmware/photon_sources/1.0/<filename>.

@@ -72,19 +78,31 @@ class pullSources:

                 handle.write(block)

         return file_path

+    def downloadFileHelper(self, package_name, package_path, package_sha1 = None):

+        self.downloadFile(package_name, package_path)

+        if package_sha1 != self.getFileHash(package_path):

+            raise Exception('Invalid sha1 for package %s' % package_name)

     def pull(self, sources_dir):

         #Download the list of sources.

-        package_file_path = self.downloadFile(sources_dir, 'sha1-all')

+        sha1_filename = 'sha1-all'

+        sha1_file_path = os.path.join(sources_dir, sha1_filename)

+        package_file_path = self.downloadFile(sha1_filename, sha1_file_path)

         with open(package_file_path) as f:

             packages = f.readlines()

         for package in packages:

             i = string.rindex(package, '-')

+

             package_name = string.strip(package[:i])

             package_sha1 = string.strip(package[i+1:])

-            package_path = self.downloadFile(sources_dir, package_name, package_sha1)

-            if package_sha1 != self.getFileHash(package_path):

-                raise Exception('Invalid sha1 for package %s' % package_name)

+            package_path = os.path.join(sources_dir, package_name)

+

+            if not os.path.isfile(package_path):

+                self.downloadFileHelper(package_name, package_path, package_sha1)

+

+            elif package_sha1 != self.getFileHash(package_path):

+                    if self.downloadExistingFilePrompt(package_name):

+                        self.downloadFileHelper(package_name, package_path, package_sha1)

 if __name__ == '__main__':

     usage = "Usage: %prog [options] <sources_dir>"

@@ -98,4 +116,5 @@ if __name__ == '__main__':

             parser.error("Incorrect number of arguments")

     p = pullSources(options.config_path)

+    print args[0]

     p.pull(args[0])

@@ -11,8 +11,8 @@

 #	Some standard locations

 #

 %_sysconfdir		/etc

-%_lib			/lib

-%_lib64			/lib64

+%_lib			/usr/lib

+%_lib64			/usr/lib64

 %_prefix		/usr

 %_exec_prefix		/usr

 %_bindir		/usr/bin