Changeset 3650


Ignore:
Timestamp:
Feb 1, 2017, 2:22:26 AM (6 months ago)
Author:
bruno
Message:
  • Fix versions given back for mr-* tools
  • Log pb and mr versions in mindi log
  • mr-getparam now prints a version
Location:
branches/3.3
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/MondoRescue/bin/mr-analyze-lvm

    r3387 r3650  
    1818use ProjectBuilder::Base;
    1919use ProjectBuilder::Distribution;
     20use MondoRescue::Version;
    2021use MondoRescue::Base;
    2122use MondoRescue::LVM;
  • branches/3.3/MondoRescue/bin/mr-check-lvm

    r3387 r3650  
    1818use ProjectBuilder::Base;
    1919use ProjectBuilder::Distribution;
     20use MondoRescue::Version;
    2021use MondoRescue::Base;
    2122use MondoRescue::LVM;
  • branches/3.3/MondoRescue/bin/mr-device-mounted

    r3447 r3650  
    1111# For pbdebug
    1212use ProjectBuilder::Base;
     13use MondoRescue::Version;
    1314use MondoRescue::Disk;
    1415
  • branches/3.3/MondoRescue/bin/mr-disk-list

    r3553 r3650  
    1111# For pbdebug
    1212use ProjectBuilder::Base;
     13use MondoRescue::Version;
    1314use MondoRescue::Disk;
    1415
  • branches/3.3/MondoRescue/bin/mr-disk-type

    r3592 r3650  
    1111# For pbdebug
    1212use ProjectBuilder::Base;
     13use MondoRescue::Version;
    1314use MondoRescue::Disk;
    1415
  • branches/3.3/MondoRescue/bin/mr-distro-getparam

    r3644 r3650  
    1212use ProjectBuilder::Distribution;
    1313use ProjectBuilder::Conf;
     14use MondoRescue::Version;
    1415use MondoRescue::Base;
    1516use Data::Dumper;
     
    8081
    8182# Global variables
    82 my ($mrver,$mrrev) = pb_version_init();
     83my ($mrver,$mrrev) = mr_version_init();
    8384my $appname = "mr-getdistro";
    8485my %opts;                   # CLI Options
  • branches/3.3/MondoRescue/bin/mr-getparam

    r3644 r3650  
    1010use ProjectBuilder::Base;
    1111use ProjectBuilder::Version;
     12use MondoRescue::Version;
    1213use MondoRescue::Base;
    1314use Data::Dumper;
     
    7879
    7980# Global variables
    80 my ($mrver,$mrrev) = pb_version_init();
     81my ($mrver,$mrrev) = mr_version_init();
    8182my $appname = "mr-getparam";
    8283my %opts;                   # CLI Options
     
    8889GetOptions("help|?|h" => \$opts{'h'},
    8990        "man" => \$opts{'man'},
     91        "version" => \$opts{'version'},
    9092        "verbose|v+" => \$opts{'v'},
    9193) || pb_syntax(-1,0);
     
    9395if (defined $opts{'h'}) {
    9496    pb_syntax(0,1);
     97}
     98if (defined $opts{'version'}) {
     99    pb_syntax(0,0);
    95100}
    96101if (defined $opts{'man'}) {
  • branches/3.3/MondoRescue/bin/mr-kernel-get-modules

    r3354 r3650  
    55use Data::Dumper;
    66use ProjectBuilder::Base;
     7use MondoRescue::Version;
    78use MondoRescue::Kernel;
    89use Getopt::Long qw(:config auto_abbrev no_ignore_case);
  • branches/3.3/MondoRescue/bin/mr-label

    r3550 r3650  
    1010use ProjectBuilder::Base;
    1111use ProjectBuilder::Version;
     12use MondoRescue::Version;
    1213use Data::Dumper;
    1314use Getopt::Long qw(:config auto_abbrev no_ignore_case);
     
    8586
    8687# Global variables
    87 my ($mrver,$mrrev) = pb_version_init();
     88my ($mrver,$mrrev) = mr_version_init();
    8889my $appname = "mr-label";
    8990my %opts;                   # CLI Options
  • branches/3.3/MondoRescue/bin/mr-mkiso

    r3648 r3650  
    1212use ProjectBuilder::Distribution;
    1313use ProjectBuilder::Conf;
     14use MondoRescue::Version;
    1415use MondoRescue::Base;
    1516use Data::Dumper;
     
    8889
    8990# Global variables
    90 my ($mrver,$mrrev) = pb_version_init();
     91my ($mrver,$mrrev) = mr_version_init();
    9192my $appname = "mr-mkiso";
    9293my %opts;                   # CLI Options
  • branches/3.3/MondoRescue/bin/mr-net-get-config

    r3638 r3650  
    1616use Getopt::Long qw(:config auto_abbrev no_ignore_case);
    1717use English;
     18use MondoRescue::Version;
    1819
    1920
     
    8586
    8687# Global variables
    87 my ($mrver,$mrrev) = pb_version_init();
     88my ($mrver,$mrrev) = mr_version_init();
    8889my $appname = "mr-net-get-config";
    8990my %opts;                   # CLI Options
  • branches/3.3/MondoRescue/bin/mr-process-ldd

    r3231 r3650  
    99use strict;
    1010use MondoRescue::File;
     11use MondoRescue::Version;
    1112
    1213=pod
  • branches/3.3/MondoRescue/bin/mr-read-all-link

    r3311 r3650  
    99use strict;
    1010use Data::Dumper;
     11use MondoRescue::Version;
    1112use MondoRescue::File;
    1213# For pbdebug
  • branches/3.3/mindi/mindi

    r3649 r3650  
    30653065echo "$@">> $LOGFILE
    30663066LogFile "-----------------------------"
     3067pbdistrocheck --version | grep Version >> $LOGFILE
    30673068LogFile "pbdistrocheck results:"
    30683069pbdistrocheck >> $LOGFILE
     3070LogFile "-----------------------------"
     3071LogFile "MondoRescue perl module:"
     3072mr-getparam --version | grep Version >> $LOGFILE
    30693073LogFile "-----------------------------"
    30703074
  • branches/3.3/mondo/src/common/libmondo-archive.c

    r3613 r3650  
    735735    if (write_one_liner_data_file(tmp, bootldr_ver)) {
    736736        res++;
    737         log_msg(1, "%ld: Unable to write one-liner bootloader.ver",
    738                 __LINE__);
     737        log_msg(1, "%ld: Unable to write one-liner bootloader.ver", __LINE__);
    739738    }
    740739    mr_free(bootldr_ver);
Note: See TracChangeset for help on using the changeset viewer.