Airtime

CreateSymlinksToUtils() used twice in airtime-upgrade.php

Details

  • Originating Party:
    QA
  • OS:
    Ubuntu 10.04
  • Browser:
    Firefox
  • Package:
    Ubuntu

Description

When upgrading from 1.8.2 deb package to the 1.9.1 test .deb package I get the error:

******************************** Update Begin *********************************
PHP Fatal error: Cannot redeclare AirtimeInstall::CreateSymlinksToUtils() in /var/lib/airtime/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php on line 49

It does seem to be declared already on line 25 for a similar function but with different content:

     public static function CreateSymlinksToUtils()
    {
        echo "* Installing airtime-user".PHP_EOL;
        $dir = AirtimeInstall::CONF_DIR_BINARIES."/utils/airtime-user";
        exec("ln -s $dir /usr/bin/airtime-user");
    }

Activity

Ascending order - Click to sort in descending order
Hide
Permalink
Daniel James added a comment -
Combining the two CreateSymlinksToUtils() functions into one seems to work.
Show
Daniel James added a comment - Combining the two CreateSymlinksToUtils() functions into one seems to work.
Hide
Permalink
James Moon added a comment -
I don't see those lines in my branch. I'm using 1.9.1 branch.

Here is my code around line 49:

     41 public static function CreateSymlinksToUtils()
     42 {
     43 echo "* Creating /usr/bin symlinks".PHP_EOL;
     44 AirtimeInstall::RemoveSymlinks();
     45
     46 echo "* Installing airtime-import".PHP_EOL;
     47 $dir = CONF_DIR_BINARIES."/utils/airtime-import/airtime-import";
     48 exec("ln -s $dir /usr/bin/airtime-import");
     49
     50 echo "* Installing airtime-update-db-settings".PHP_EOL;
     51 $dir = CONF_DIR_BINARIES."/utils/airtime-update-db-settings";
     52 exec("ln -s $dir /usr/bin/airtime-update-db-settings");
     53
     54 echo "* Installing airtime-check-system".PHP_EOL;
     55 $dir = CONF_DIR_BINARIES."/utils/airtime-check-system";
     56 exec("ln -s $dir /usr/bin/airtime-check-system");
     57 }

around 25:

     22 const CONF_DIR_LOG = "/var/log/airtime";
     23
     24 public static function CreateZendPhpLogFile(){
     25 global $CC_CONFIG;
     26
     27 echo "* Creating logs directory ".AirtimeInstall::CONF_DIR_LOG.PHP_EOL;
     28
     29 $path = AirtimeInstall::CONF_DIR_LOG;
     30 $file = $path.'/zendphp.log';
     31 if (!file_exists($path)){
     32 mkdir($path, 0755, true);
     33 }
     34
     35 touch($file);
     36 chmod($file, 0755);
     37 chown($file, $CC_CONFIG['webServerUser']);
     38 chgrp($file, $CC_CONFIG['webServerUser']);
     39 }

also CreateSymlinksToUtils looks different than mine. Do you know what's going on here?
Show
James Moon added a comment - I don't see those lines in my branch. I'm using 1.9.1 branch. Here is my code around line 49:      41 public static function CreateSymlinksToUtils()      42 {      43 echo "* Creating /usr/bin symlinks".PHP_EOL;      44 AirtimeInstall::RemoveSymlinks();      45      46 echo "* Installing airtime-import".PHP_EOL;      47 $dir = CONF_DIR_BINARIES."/utils/airtime-import/airtime-import";      48 exec("ln -s $dir /usr/bin/airtime-import");      49      50 echo "* Installing airtime-update-db-settings".PHP_EOL;      51 $dir = CONF_DIR_BINARIES."/utils/airtime-update-db-settings";      52 exec("ln -s $dir /usr/bin/airtime-update-db-settings");      53      54 echo "* Installing airtime-check-system".PHP_EOL;      55 $dir = CONF_DIR_BINARIES."/utils/airtime-check-system";      56 exec("ln -s $dir /usr/bin/airtime-check-system");      57 } around 25:      22 const CONF_DIR_LOG = "/var/log/airtime";      23      24 public static function CreateZendPhpLogFile(){      25 global $CC_CONFIG;      26      27 echo "* Creating logs directory ".AirtimeInstall::CONF_DIR_LOG.PHP_EOL;      28      29 $path = AirtimeInstall::CONF_DIR_LOG;      30 $file = $path.'/zendphp.log';      31 if (!file_exists($path)){      32 mkdir($path, 0755, true);      33 }      34      35 touch($file);      36 chmod($file, 0755);      37 chown($file, $CC_CONFIG['webServerUser']);      38 chgrp($file, $CC_CONFIG['webServerUser']);      39 } also CreateSymlinksToUtils looks different than mine. Do you know what's going on here?
Hide
Permalink
Daniel James added a comment -
Hi James, I just double-checked this file in the tarball from Sourceforge http://downloads.sourceforge.net/project/airtime/1.9.1/airtime-1.9.1.tar.gz and the function is definitely used twice there. My copy of the file is very different from yours. Do you have a 1.9.1 tarball which matches what you're seeing in your branch? If the Sourceforge tarball is wrong, it would explain a lot of the bugs I've seen today.
Show
Daniel James added a comment - Hi James, I just double-checked this file in the tarball from Sourceforge http://downloads.sourceforge.net/project/airtime/1.9.1/airtime-1.9.1.tar.gz and the function is definitely used twice there. My copy of the file is very different from yours. Do you have a 1.9.1 tarball which matches what you're seeing in your branch? If the Sourceforge tarball is wrong, it would explain a lot of the bugs I've seen today.
Hide
Permalink
Daniel James added a comment - - edited
Suspect 1.9.1 upgrade script from Sourceforge tarball attached to this ticket.
Show
Daniel James added a comment - - edited Suspect 1.9.1 upgrade script from Sourceforge tarball attached to this ticket.
Hide
Permalink
Daniel James added a comment -
I think I found the problem, the file from the tarball on Sourceforge matches the devel branch, not the master branch. So I've got this in my .deb package:

https://github.com/sourcefabric/Airtime/blob/devel/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php

not this:

https://github.com/sourcefabric/Airtime/blob/master/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
Show
Daniel James added a comment - I think I found the problem, the file from the tarball on Sourceforge matches the devel branch, not the master branch. So I've got this in my .deb package: https://github.com/sourcefabric/Airtime/blob/devel/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php not this: https://github.com/sourcefabric/Airtime/blob/master/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
Hide
Permalink
James Moon added a comment -
1.9.1 branch is now pushed to master branch. Can you please confirm?
Thank you
Show
James Moon added a comment - 1.9.1 branch is now pushed to master branch. Can you please confirm? Thank you
Hide
Permalink
Daniel James added a comment -
It now looks like both branches have the broken copy of install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php - compare line 25 with 49, they are the same.
Show
Daniel James added a comment - It now looks like both branches have the broken copy of install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php - compare line 25 with 49, they are the same.
Hide
Permalink
Martin Konecny added a comment -
Daniel,

Please checkout the 1.9.1 branch (this branch also contains 1.9.2 changes). The duplicate functions have now been merged.
Show
Martin Konecny added a comment - Daniel, Please checkout the 1.9.1 branch (this branch also contains 1.9.2 changes). The duplicate functions have now been merged.
Hide
Permalink
Daniel James added a comment -
Thanks Martin, I can now see the fix in the git repo.
Show
Daniel James added a comment - Thanks Martin, I can now see the fix in the git repo.

People

  • Assignee:
    Ofir Gal
    Reporter:
    Daniel James
    Implemented by:
    James Moon
    Reviewed by:
    Paul
Vote (0)
Watch (0)

Dates

  • Created:
    Updated:
    Resolved: